diff --git a/.ci/Jenkinsfile_flaky b/.ci/Jenkinsfile_flaky index 3f77243da2c1b..e1cbac0528b1f 100644 --- a/.ci/Jenkinsfile_flaky +++ b/.ci/Jenkinsfile_flaky @@ -8,26 +8,28 @@ def JOB_PARTS = params.CI_GROUP.split(':') def IS_XPACK = JOB_PARTS[0] == 'xpack' def JOB = JOB_PARTS[1] def CI_GROUP = JOB_PARTS.size() > 2 ? JOB_PARTS[2] : '' +def EXECUTIONS = params.NUMBER_EXECUTIONS.toInteger() +def AGENT_COUNT = getAgentCount(EXECUTIONS) def worker = getWorkerFromParams(IS_XPACK, JOB, CI_GROUP) def workerFailures = [] currentBuild.displayName += trunc(" ${params.GITHUB_OWNER}:${params.branch_specifier}", 24) -currentBuild.description = "${params.CI_GROUP}
Executions: ${params.NUMBER_EXECUTIONS}" - -// Note: If you increase agent count, it will execute NUMBER_EXECUTIONS per agent. It will not divide them up amongst the agents -// e.g. NUMBER_EXECUTIONS = 25, agentCount = 4 results in 100 total executions -def agentCount = 1 +currentBuild.description = "${params.CI_GROUP}
Agents: ${AGENT_COUNT}
Executions: ${params.NUMBER_EXECUTIONS}" stage("Kibana Pipeline") { timeout(time: 180, unit: 'MINUTES') { timestamps { ansiColor('xterm') { def agents = [:] - for(def agentNumber = 1; agentNumber <= agentCount; agentNumber++) { + for(def agentNumber = 1; agentNumber <= AGENT_COUNT; agentNumber++) { + def agentNumberInside = agentNumber + def agentExecutions = floor(EXECUTIONS/AGENT_COUNT) + (agentNumber <= EXECUTIONS%AGENT_COUNT ? 1 : 0) agents["agent-${agentNumber}"] = { catchError { + print "Agent ${agentNumberInside} - ${agentExecutions} executions" + kibanaPipeline.withWorkers('flaky-test-runner', { if (!IS_XPACK) { kibanaPipeline.buildOss() @@ -37,7 +39,7 @@ stage("Kibana Pipeline") { } else { kibanaPipeline.buildXpack() } - }, getWorkerMap(agentNumber, params.NUMBER_EXECUTIONS.toInteger(), worker, workerFailures))() + }, getWorkerMap(agentNumberInside, agentExecutions, worker, workerFailures))() } } } @@ -77,9 +79,9 @@ def getWorkerFromParams(isXpack, job, ciGroup) { } } -def getWorkerMap(agentNumber, numberOfExecutions, worker, workerFailures, maxWorkers = 14) { +def getWorkerMap(agentNumber, numberOfExecutions, worker, workerFailures, maxWorkerProcesses = 12) { def workerMap = [:] - def numberOfWorkers = Math.min(numberOfExecutions, maxWorkers) + def numberOfWorkers = Math.min(numberOfExecutions, maxWorkerProcesses) for(def i = 1; i <= numberOfWorkers; i++) { def workerExecutions = numberOfExecutions/numberOfWorkers + (i <= numberOfExecutions%numberOfWorkers ? 1 : 0) @@ -87,7 +89,10 @@ def getWorkerMap(agentNumber, numberOfExecutions, worker, workerFailures, maxWor workerMap["agent-${agentNumber}-worker-${i}"] = { workerNumber -> for(def j = 0; j < workerExecutions; j++) { print "Execute agent-${agentNumber} worker-${workerNumber}: ${j}" - withEnv(["JOB=agent-${agentNumber}-worker-${workerNumber}-${j}"]) { + withEnv([ + "JOB=agent-${agentNumber}-worker-${workerNumber}-${j}", + "REMOVE_KIBANA_INSTALL_DIR=1", + ]) { catchError { try { worker(workerNumber) @@ -104,6 +109,11 @@ def getWorkerMap(agentNumber, numberOfExecutions, worker, workerFailures, maxWor return workerMap } +def getAgentCount(executions) { + // Increase agent count every 24 worker processess, up to 3 agents maximum + return Math.min(3, 1 + floor(executions/24)) +} + def trunc(str, length) { if (str.size() >= length) { return str.take(length) + "..." @@ -111,3 +121,11 @@ def trunc(str, length) { return str; } + +// All of the real rounding/truncating methods are sandboxed +def floor(num) { + return num + .toString() + .split('\\.')[0] + .toInteger() +} diff --git a/.ci/jobs.yml b/.ci/jobs.yml index fc3e80064fa6f..a2d8100f78efd 100644 --- a/.ci/jobs.yml +++ b/.ci/jobs.yml @@ -14,7 +14,8 @@ JOB: - kibana-ciGroup10 - kibana-ciGroup11 - kibana-ciGroup12 - # - kibana-visualRegression + - kibana-accessibility + - kibana-visualRegression # make sure all x-pack-ciGroups are listed in test/scripts/jenkins_xpack_ci_group.sh - x-pack-firefoxSmoke @@ -28,7 +29,8 @@ JOB: - x-pack-ciGroup8 - x-pack-ciGroup9 - x-pack-ciGroup10 - # - x-pack-visualRegression + - x-pack-accessibility + - x-pack-visualRegression # `~` is yaml for `null` exclude: ~ diff --git a/.ci/run.sh b/.ci/run.sh index 88ce0bd9986a1..9f77438be62d0 100755 --- a/.ci/run.sh +++ b/.ci/run.sh @@ -21,6 +21,9 @@ kibana-ciGroup*) kibana-visualRegression*) ./test/scripts/jenkins_visual_regression.sh ;; +kibana-accessibility*) + ./test/scripts/jenkins_accessibility.sh + ;; kibana-firefoxSmoke*) ./test/scripts/jenkins_firefox_smoke.sh ;; @@ -34,6 +37,9 @@ x-pack-ciGroup*) x-pack-visualRegression*) ./test/scripts/jenkins_xpack_visual_regression.sh ;; +x-pack-accessibility*) + ./test/scripts/jenkins_xpack_accessibility.sh + ;; x-pack-firefoxSmoke*) ./test/scripts/jenkins_xpack_firefox_smoke.sh ;; diff --git a/.eslintrc.js b/.eslintrc.js index 22d8e67ea702d..16a80f01278a5 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -55,6 +55,193 @@ module.exports = { extends: ['@elastic/eslint-config-kibana', 'plugin:@elastic/eui/recommended'], overrides: [ + /** + * Temporarily disable some react rules for specific plugins, remove in separate PRs + */ + { + files: ['packages/kbn-ui-framework/**/*.{js,ts,tsx}'], + rules: { + 'jsx-a11y/no-onchange': 'off', + }, + }, + { + files: ['src/core/public/application/**/*.{js,ts,tsx}'], + rules: { + 'react/no-danger': 'off', + }, + }, + { + files: ['src/legacy/core_plugins/console/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + }, + }, + { + files: ['src/legacy/core_plugins/data/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + }, + }, + { + files: ['src/legacy/core_plugins/expressions/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + }, + }, + { + files: ['src/legacy/core_plugins/kbn_vislib_vis_types/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + }, + }, + { + files: ['src/legacy/core_plugins/kibana/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/rules-of-hooks': 'off', + 'react-hooks/exhaustive-deps': 'off', + }, + }, + { + files: ['src/legacy/core_plugins/tile_map/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + }, + }, + { + files: ['src/legacy/core_plugins/vis_type_markdown/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + }, + }, + { + files: ['src/legacy/core_plugins/vis_type_metric/**/*.{js,ts,tsx}'], + rules: { + 'jsx-a11y/click-events-have-key-events': 'off', + }, + }, + { + files: ['src/legacy/core_plugins/vis_type_table/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + }, + }, + { + files: ['src/legacy/core_plugins/vis_type_vega/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + }, + }, + { + files: ['src/legacy/ui/public/vis/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + }, + }, + { + files: ['src/plugins/es_ui_shared/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + }, + }, + { + files: ['src/plugins/eui_utils/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + }, + }, + { + files: ['src/plugins/kibana_react/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/rules-of-hooks': 'off', + 'react-hooks/exhaustive-deps': 'off', + }, + }, + { + files: ['src/plugins/kibana_utils/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + }, + }, + { + files: ['x-pack/legacy/plugins/canvas/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + 'jsx-a11y/click-events-have-key-events': 'off', + }, + }, + { + files: ['x-pack/legacy/plugins/cross_cluster_replication/**/*.{js,ts,tsx}'], + rules: { + 'jsx-a11y/click-events-have-key-events': 'off', + }, + }, + { + files: ['x-pack/legacy/plugins/graph/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + }, + }, + { + files: ['x-pack/legacy/plugins/index_management/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + 'react-hooks/rules-of-hooks': 'off', + }, + }, + { + files: ['x-pack/legacy/plugins/infra/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + 'react-hooks/rules-of-hooks': 'off', + }, + }, + { + files: ['x-pack/legacy/plugins/lens/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + 'react-hooks/rules-of-hooks': 'off', + }, + }, + { + files: ['x-pack/legacy/plugins/ml/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + }, + }, + { + files: ['x-pack/legacy/plugins/monitoring/**/*.{js,ts,tsx}'], + rules: { + 'jsx-a11y/click-events-have-key-events': 'off', + }, + }, + { + files: ['x-pack/legacy/plugins/siem/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + 'react-hooks/rules-of-hooks': 'off', + }, + }, + { + files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + }, + }, + { + files: ['x-pack/legacy/plugins/uptime/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/exhaustive-deps': 'off', + 'react-hooks/rules-of-hooks': 'off', + }, + }, + { + files: ['x-pack/legacy/plugins/watcher/**/*.{js,ts,tsx}'], + rules: { + 'react-hooks/rules-of-hooks': 'off', + 'react-hooks/exhaustive-deps': 'off', + }, + }, + /** * Prettier */ @@ -175,10 +362,10 @@ module.exports = { '!src/core/server/*.test.mocks.ts', 'src/plugins/**/public/**/*', - '!src/plugins/**/public/index*', + '!src/plugins/**/public/index.{js,ts,tsx}', 'src/plugins/**/server/**/*', - '!src/plugins/**/server/index*', + '!src/plugins/**/server/index.{js,ts,tsx}', ], allowSameFolder: true, }, @@ -213,6 +400,7 @@ module.exports = { 'x-pack/test/functional/apps/**/*.js', 'x-pack/legacy/plugins/apm/**/*.js', 'test/*/config.ts', + 'test/*/{tests,test_suites,apis,apps}/**/*', 'test/visual_regression/tests/**/*', 'x-pack/test/*/{tests,test_suites,apis,apps}/**/*', 'x-pack/test/*/*config.*ts', diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7001e32754abb..94296d076189b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -8,9 +8,14 @@ # App Architecture /src/plugins/data/ @elastic/kibana-app-arch -/src/plugins/kibana_utils/ @elastic/kibana-app-arch +/src/plugins/embeddable/ @elastic/kibana-app-arch +/src/plugins/expressions/ @elastic/kibana-app-arch /src/plugins/kibana_react/ @elastic/kibana-app-arch +/src/plugins/kibana_utils/ @elastic/kibana-app-arch /src/plugins/navigation/ @elastic/kibana-app-arch +/src/plugins/ui_actions/ @elastic/kibana-app-arch +/src/plugins/visualizations/ @elastic/kibana-app-arch +/x-pack/plugins/advanced_ui_actions/ @elastic/kibana-app-arch # APM /x-pack/legacy/plugins/apm/ @elastic/apm-ui @@ -37,7 +42,9 @@ /x-pack/test/functional/apps/machine_learning/ @elastic/ml-ui /x-pack/test/functional/services/machine_learning/ @elastic/ml-ui /x-pack/test/functional/services/ml.ts @elastic/ml-ui -/x-pack/legacy/plugins/transform/ @elastic/ml-ui +# ML team owns the transform plugin, ES team added here for visibility +# because the plugin lives in Kibana's Elasticsearch management section. +/x-pack/legacy/plugins/transform/ @elastic/ml-ui @elastic/es-ui # Operations /renovate.json5 @elastic/kibana-operations @@ -56,11 +63,14 @@ /src/legacy/server/saved_objects/ @elastic/kibana-platform /config/kibana.yml @elastic/kibana-platform /x-pack/plugins/features/ @elastic/kibana-platform +/x-pack/plugins/licensing/ @elastic/kibana-platform # Security /x-pack/legacy/plugins/security/ @elastic/kibana-security /x-pack/legacy/plugins/spaces/ @elastic/kibana-security +/x-pack/plugins/spaces/ @elastic/kibana-security /x-pack/legacy/plugins/encrypted_saved_objects/ @elastic/kibana-security +/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security /src/legacy/server/csp/ @elastic/kibana-security /x-pack/plugins/security/ @elastic/kibana-security /x-pack/test/api_integration/apis/security/ @elastic/kibana-security @@ -88,9 +98,6 @@ /x-pack/legacy/plugins/rollup/ @elastic/es-ui /x-pack/legacy/plugins/searchprofiler/ @elastic/es-ui /x-pack/legacy/plugins/snapshot_restore/ @elastic/es-ui -# ML team owns the transform plugin, ES team added here for visibility -# because the plugin lives in Kibana's Elasticsearch management section. -/x-pack/legacy/plugins/transform/ @elastic/es-ui /x-pack/legacy/plugins/watcher/ @elastic/es-ui # Kibana TSVB external contractors diff --git a/.i18nrc.json b/.i18nrc.json index d77293e3dc8f7..01065201b9d64 100644 --- a/.i18nrc.json +++ b/.i18nrc.json @@ -1,37 +1,39 @@ { "paths": { "common.ui": "src/legacy/ui", - "data": ["src/legacy/core_plugins/data", "src/plugins/data"], - "expressions": "src/legacy/core_plugins/expressions", - "kibana_react": "src/legacy/core_plugins/kibana_react", - "navigation": "src/legacy/core_plugins/navigation", - "server": "src/legacy/server", "console": "src/legacy/core_plugins/console", "core": "src/core", + "dashboardEmbeddableContainer": "src/plugins/dashboard_embeddable_container", + "data": ["src/legacy/core_plugins/data", "src/plugins/data"], + "embeddableApi": "src/plugins/embeddable", + "esUi": "src/plugins/es_ui_shared", + "expressions_np": "src/plugins/expressions", + "expressions": "src/legacy/core_plugins/expressions", "inputControl": "src/legacy/core_plugins/input_control_vis", + "inspector": "src/plugins/inspector", "inspectorViews": "src/legacy/core_plugins/inspector_views", "interpreter": "src/legacy/core_plugins/interpreter", - "dashboardEmbeddableContainer": "src/legacy/core_plugins/dashboard_embeddable_container", "kbn": "src/legacy/core_plugins/kibana", "kbnDocViews": "src/legacy/core_plugins/kbn_doc_views", - "embeddableApi": "src/plugins/embeddable", + "kbnESQuery": "packages/kbn-es-query", "kbnVislibVisTypes": "src/legacy/core_plugins/kbn_vislib_vis_types", - "visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown", - "visTypeMetric": "src/legacy/core_plugins/vis_type_metric", - "visTypeVega": "src/legacy/core_plugins/vis_type_vega", - "visTypeTable": "src/legacy/core_plugins/vis_type_table", + "kibana_react": "src/legacy/core_plugins/kibana_react", + "kibana-react": "src/plugins/kibana_react", + "navigation": "src/legacy/core_plugins/navigation", "regionMap": "src/legacy/core_plugins/region_map", + "server": "src/legacy/server", "statusPage": "src/legacy/core_plugins/status_page", + "telemetry": "src/legacy/core_plugins/telemetry", "tileMap": "src/legacy/core_plugins/tile_map", "timelion": "src/legacy/core_plugins/timelion", + "uiActions": "src/plugins/ui_actions", + "visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown", + "visTypeMetric": "src/legacy/core_plugins/vis_type_metric", + "visTypeTable": "src/legacy/core_plugins/vis_type_table", "visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud", "visTypeTimeseries": "src/legacy/core_plugins/vis_type_timeseries", - "kbnESQuery": "packages/kbn-es-query", - "inspector": "src/plugins/inspector", - "kibana-react": "src/plugins/kibana_react", - "telemetry": "src/legacy/core_plugins/telemetry", - "esUi": "src/plugins/es_ui_shared", - "uiActions": "src/plugins/ui_actions" + "visTypeVega": "src/legacy/core_plugins/vis_type_vega", + "visualizations": "src/plugins/visualizations" }, "exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"], "translations": [] diff --git a/Jenkinsfile b/Jenkinsfile index 4820de9876737..8d8579736f639 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,8 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a 'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11), 'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12), 'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld './test/scripts/jenkins_firefox_smoke.sh' }), - // 'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld './test/scripts/jenkins_visual_regression.sh' }), + 'oss-accessibility': kibanaPipeline.getPostBuildWorker('accessibility', { runbld './test/scripts/jenkins_accessibility.sh' }), + 'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld './test/scripts/jenkins_visual_regression.sh' }), ]), 'kibana-xpack-agent': kibanaPipeline.withWorkers('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [ 'xpack-ciGroup1': kibanaPipeline.getXpackCiGroupWorker(1), @@ -39,7 +40,8 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a 'xpack-ciGroup9': kibanaPipeline.getXpackCiGroupWorker(9), 'xpack-ciGroup10': kibanaPipeline.getXpackCiGroupWorker(10), 'xpack-firefoxSmoke': kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld './test/scripts/jenkins_xpack_firefox_smoke.sh' }), - // 'xpack-visualRegression': kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld './test/scripts/jenkins_xpack_visual_regression.sh' }), + 'xpack-accessibility': kibanaPipeline.getPostBuildWorker('xpack-accessibility', { runbld './test/scripts/jenkins_xpack_accessibility.sh' }), + 'xpack-visualRegression': kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld './test/scripts/jenkins_xpack_visual_regression.sh' }), ]), ]) } diff --git a/README.md b/README.md index 2d33cd218b3da..03ce6a6525873 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ _Note: The version numbers below are only examples, meant to illustrate the rela ## Questions? Problems? Suggestions? -- If you've found a bug or want to request a feature, please create a [GitHub Issue](https://github.com/elastic/kibana/issues/new). -Please check to make sure someone else hasn't already created an issue for the same topic. +- If you've found a bug or want to request a feature, please create a [GitHub Issue](https://github.com/elastic/kibana/issues/new/choose). + Please check to make sure someone else hasn't already created an issue for the same topic. - Need help using Kibana? Ask away on our [Kibana Discuss Forum](https://discuss.elastic.co/c/kibana) and a fellow community member or Elastic engineer will be glad to help you out. diff --git a/docs/canvas/canvas-expressions.asciidoc b/docs/canvas/canvas-expressions.asciidoc deleted file mode 100644 index 0fcc69c6db726..0000000000000 --- a/docs/canvas/canvas-expressions.asciidoc +++ /dev/null @@ -1,39 +0,0 @@ -[[canvas-expression-editor]] -=== Customize your element with the expression editor - -Each element is backed by an expression that represents the element style and data. To further define the appearance and behavior of the element, use the expression editor. - -. In the lower right corner, click *Expression editor*. - -. Edit the style and data parts of the expression that you want to change. - -. Click *Run*. - -. If you like what you see, click *Close*. - -For information about the Canvas expression language, see <>. - -//Insert expression video. - -[float] -[[canvas-expression-editor-example]] -=== Example: Using the expression editor - -Build a complex element using expressions. - -``` -image mode="contain" dataurl={ -asset { -filters | essql -query="SELECT host,response -FROM kibana_sample_data_logs -WHERE host='artifacts.elastic.co' -ORDER BY timestamp DESC -LIMIT 1"| -alterColumn "response" type="number" | -getCell "response" | -if {compare lt to=400} then="asset-0a807073-d056-4c7b-9bf4-225b71e47243" else="asset-1343672d-7c02-4402-929e-0f8fef69cddd" -} -} | render - -``` \ No newline at end of file diff --git a/docs/canvas/canvas-share-workpad.asciidoc b/docs/canvas/canvas-share-workpad.asciidoc index 5cc5b953e5775..119ede16fe1e7 100644 --- a/docs/canvas/canvas-share-workpad.asciidoc +++ b/docs/canvas/canvas-share-workpad.asciidoc @@ -2,47 +2,100 @@ [[workpad-share-options]] == Share your workpad -When you are ready to share your workpad, create a PDF, or export your workpad. +When you've finished your workpad, you can share it outside of {kib}. + +[float] +[[export-single-workpad]] +=== Export workpads + +Create a JSON file of your workpad that you can export outside of {kib}. + +. From your workpad, click the *Share workpad* icon in the upper left corner. + +. Select *Download as JSON*. ++ +[role="screenshot"] +image::images/canvas-export-workpad.png[Export single workpad] + +Want to export multiple workpads? Go to the *Canvas workpads* view, select the workpads you want to export, then click *Export*. [float] [[create-workpad-pdf]] === Create a PDF -To view your workpad outside of Kibana, generate a PDF. +Create a PDF copy of your workpad that you can save and share outside of {kib}. . If you are using a Gold or Platinum license, enable reporting in your `config/kibana.yml` file. . From your workpad, click the *Share workpad* icon in the upper left corner, then select *PDF reports*. -. Click *Generate PDF*. +. Click *Generate PDF*. + [role="screenshot"] image::images/canvas-generate-pdf.gif[Generate PDF] [float] -[[export-workpad]] -=== Export your workpad +[[create-workpad-URL]] +=== Create a POST URL + +Create a POST URL that you can use to automatically generate PDF reports using Watcher or a script. + +For more information, refer to <>. + +. If you are using a Gold or Platinum license, enable reporting in your `config/kibana.yml` file. + +. From your workpad, click the *Share workpad* icon in the upper left corner, then select *PDF reports*. -To share your workpad with another author, export it as a JSON file. +. Click *Copy POST URL*. ++ +[role="screenshot"] +image::images/canvas-create-URL.gif[Create POST URL] [float] -[[export-single-workpad]] -==== Export a single workpad +[[add-workpad-website]] +=== Share the workpad on a website -. From your workpad, click the *Share workpad* icon in the upper left corner. +beta[] Download the workpad and share it on any website, then customize the workpad behavior to autoplay the pages or hide the toolbar. -. Select *Download as JSON*. +. If you are using a Gold or Platinum license, enable reporting in your `config/kibana.yml` file. + +. From your workpad, click the *Share this workpad* icon in the upper left corner, then select *Share on a website*. + +. On the *Share on a website* pane, follow the instructions. + +. To customize the workpad behavior to autoplay the pages or hide the toolbar, use the inline parameters. ++ +To make sure that your data remains secure, the data in the JSON file is not connected to {kib}. Canvas does not display elements that manipulate the data on the workpad. + [role="screenshot"] -image::images/canvas-export-workpad.png[Export single workpad] +image::images/canvas-embed_workpad.gif[Share the workpad on a website] ++ +NOTE: Shareable workpads encode the current state of the workpad in a JSON file. When you make changes to the workpad, the changes do not appear in the shareable workpad on your website. [float] -[[export-multiple-workpads]] -==== Export multiple workpads +[[change-the-workpad-settings]] +=== Change the shareable workpad settings -. Go to the *Canvas workpads* page. +After you've added the workpad to your website, you can change the autoplay and toolbar settings. -. Select the workpads you want to export +[float] +[[shareable-workpad-enable-autoplay]] +==== Change the autoplay settings -. Click *Export*. +. In the lower right corner of the shareable workpad, click the settings icon. +. Click *Auto Play*, then change the settings. ++ +[role="screenshot"] +image::images/canvas_share_autoplay_480.gif[Autoplay settings] + +[float] +[[hide-workpad-toolbar]] +==== Change the toolbar settings + +. In the lower right corner, click the settings icon. + +. Click *Toolbar*, then change the settings. ++ +[role="screenshot"] +image::images/canvas_share_hidetoolbar_480.gif[Hide toolbar settings] diff --git a/docs/canvas/canvas-workpad.asciidoc b/docs/canvas/canvas-workpad.asciidoc index f664f055a5ff6..f833bd903b0bc 100644 --- a/docs/canvas/canvas-workpad.asciidoc +++ b/docs/canvas/canvas-workpad.asciidoc @@ -18,17 +18,17 @@ To create a workpad, you can: [[blank-canvas-workpad]] === Start with a blank page -To use the background colors, images, and data of your choice, start with a blank workpad. +To use the background colors, images, and data of your choice, start with a blank workpad. . Open *Canvas*. -. On the *Canvas workpads* page, click *Create workpad*. +. On the *Canvas workpads* view, click *Create workpad*. . Add a *Name* to your workpad. -. In the *Width* and *Height* fields, specify the size. +. In the *Width* and *Height* fields, specify the size. -. Select the layout. +. Select the layout. + For example, click *720p* for a traditional presentation layout. @@ -45,7 +45,7 @@ If you're unsure about where to start, you can use one of the preconfigured temp . Open *Canvas*. -. On the *Canvas workpads* page, select *Templates*. +. On the *Canvas workpads* view, select *Templates*. . Click the preconfigured template that you want to use. @@ -59,7 +59,7 @@ When you want to use a workpad that someone else has already started, import the . Open *Canvas*. -. On the *Canvas workpads* page, click and drag the file to the *Import workpad JSON file* field. +. On the *Canvas workpads* view, click and drag the file to the *Import workpad JSON file* field. [float] [[sample-data-workpad]] @@ -67,11 +67,11 @@ When you want to use a workpad that someone else has already started, import the Each of the sample data sets comes with a Canvas workpad that you can use for your own workpad inspiration. -. Add a {kibana-ref}/add-sample-data.html[sample data set]. +. Add a {kibana-ref}/add-sample-data.html[sample data set]. . On the *Add Data to Kibana* page, click the *View data* dropdown list, then select *Canvas*. + -Need some more workpad inspiration? Check out the link:https://www.elastic.co/blog/[Elastic Blog]. +Need some more workpad inspiration? Check out the link:https://www.elastic.co/blog/[Elastic Blog]. [float] [[apply-workpad-styles]] diff --git a/docs/discover/kuery.asciidoc b/docs/discover/kuery.asciidoc index a87b8d5a78604..abf3e05fb7819 100644 --- a/docs/discover/kuery.asciidoc +++ b/docs/discover/kuery.asciidoc @@ -73,3 +73,87 @@ set these terms will be matched against all fields. For example, a query for `re in the response field, but a query for just `200` will search for 200 across all fields in your index. ============ +===== Nested Field Support + +KQL supports querying on {ref}/nested.html[nested fields] through a special syntax. You can query nested fields in subtly different +ways, depending on the results you want, so crafting nested queries requires extra thought. + +One main consideration is how to match parts of the nested query to the individual nested documents. +There are two main approaches to take: + +* *Parts of the query may only match a single nested document.* This is what most users want when querying on a nested field. +* *Parts of the query can match different nested documents.* This is how a regular object field works. + Although generally less useful, there might be occasions where you want to query a nested field in this way. + +Let's take a look at the first approach. In the following document, `items` is a nested field: + +[source,json] +---------------------------------- +{ + "grocery_name": "Elastic Eats", + "items": [ + { + "name": "banana", + "stock": "12", + "category": "fruit" + }, + { + "name": "peach", + "stock": "10", + "category": "fruit" + }, + { + "name": "carrot", + "stock": "9", + "category": "vegetable" + }, + { + "name": "broccoli", + "stock": "5", + "category": "vegetable" + } + ] +} +---------------------------------- + +To find stores that have more than 10 bananas in stock, you would write a query like this: + +`items:{ name:banana and stock > 10 }` + +`items` is the "nested path". Everything inside the curly braces (the "nested group") must match a single document. +For example, `items:{ name:banana and stock:9 }` does not match because there isn't a single nested document that +matches the entire query in the nested group. + +What if you want to find a store with more than 10 bananas that *also* stocks vegetables? This is the second way of querying a nested field, and you can do it like this: + +`items:{ name:banana and stock > 10 } and items:{ category:vegetable }` + +The first nested group (`name:banana and stock > 10`) must still match a single document, but the `category:vegetables` +subquery can match a different nested document because it is in a separate group. + +KQL's syntax also supports nested fields inside of other nested fields—you simply have to specify the full path. Suppose you +have a document where `level1` and `level2` are both nested fields: + +[source,json] +---------------------------------- +{ + "level1": [ + { + "level2": [ + { + "prop1": "foo", + "prop2": "bar" + }, + { + "prop1": "baz", + "prop2": "qux" + } + ] + } + ] +} +---------------------------------- + +You can match on a single nested document by specifying the full path: + +`level1.level2:{ prop1:foo and prop2:bar }` diff --git a/docs/images/canvas-create-URL.gif b/docs/images/canvas-create-URL.gif new file mode 100644 index 0000000000000..c7dfab28c681e Binary files /dev/null and b/docs/images/canvas-create-URL.gif differ diff --git a/docs/images/canvas-embed_workpad.gif b/docs/images/canvas-embed_workpad.gif new file mode 100644 index 0000000000000..0ffbdeab2862d Binary files /dev/null and b/docs/images/canvas-embed_workpad.gif differ diff --git a/docs/images/canvas-export-workpad.png b/docs/images/canvas-export-workpad.png index 687c8a121b65a..fa910daf948d7 100644 Binary files a/docs/images/canvas-export-workpad.png and b/docs/images/canvas-export-workpad.png differ diff --git a/docs/images/canvas-generate-pdf.gif b/docs/images/canvas-generate-pdf.gif index 6d60f948de77a..a51e04cb623a6 100644 Binary files a/docs/images/canvas-generate-pdf.gif and b/docs/images/canvas-generate-pdf.gif differ diff --git a/docs/images/canvas_share_autoplay_480.gif b/docs/images/canvas_share_autoplay_480.gif new file mode 100644 index 0000000000000..da6d8c74dd5ca Binary files /dev/null and b/docs/images/canvas_share_autoplay_480.gif differ diff --git a/docs/images/canvas_share_hidetoolbar_480.gif b/docs/images/canvas_share_hidetoolbar_480.gif new file mode 100644 index 0000000000000..6206714aa2804 Binary files /dev/null and b/docs/images/canvas_share_hidetoolbar_480.gif differ diff --git a/docs/infrastructure/getting-started.asciidoc b/docs/infrastructure/getting-started.asciidoc index 1c5645f5a6e4e..7122ad5c19f75 100644 --- a/docs/infrastructure/getting-started.asciidoc +++ b/docs/infrastructure/getting-started.asciidoc @@ -1,6 +1,6 @@ [role="xpack"] [[xpack-metrics-getting-started]] -== Getting started with infrastructure monitoring +== Getting started with metrics To get started with the Metrics app in Kibana, you need to start collecting metrics data for your infrastructure. @@ -8,4 +8,4 @@ Kibana provides step-by-step instructions to help you add metrics data. The {metrics-guide}[Metrics Monitoring Guide] is a good source for more detailed information and instructions. [role="screenshot"] -image::infrastructure/images/metrics-add-data.png[Screenshot showing Add metric data to Kibana UI] +image::infrastructure/images/metrics-add-data.png[Screenshot showing Add metric data to Kibana] diff --git a/docs/infrastructure/index.asciidoc b/docs/infrastructure/index.asciidoc index 17361ef6a6080..5e2d0f3e757b0 100644 --- a/docs/infrastructure/index.asciidoc +++ b/docs/infrastructure/index.asciidoc @@ -4,13 +4,13 @@ [partintro] -- -The Metrics app enables you to monitor your infrastructure and identify problems in real time. +The Metrics app enables you to monitor your infrastructure metrics and identify problems in real time. You start with a visual summary of your infrastructure where you can view basic metrics for common servers, containers, and services. Then you can drill down to view more detailed metrics or other information for that component. You can: -* View an inventory of your infrastructure by hosts, Kubernetes pod or Docker containers. +* View your infrastructure metrics by hosts, Kubernetes pods or Docker containers. You can group and filter the data in various ways to help you identify the items that interest you. * View current and historic values for metrics such as CPU usage, memory usage, and network traffic for each component. diff --git a/docs/infrastructure/infra-ui.asciidoc b/docs/infrastructure/infra-ui.asciidoc index 5c8c50a978d63..120a22541717c 100644 --- a/docs/infrastructure/infra-ui.asciidoc +++ b/docs/infrastructure/infra-ui.asciidoc @@ -2,12 +2,12 @@ [[infra-ui]] == Using the Metrics app -Use the Metrics app in {kib} to monitor your infrastructure and identify problems in real time. +Use the Metrics app in {kib} to monitor your infrastructure metrics and identify problems in real time. You can explore metrics for hosts, containers, and services. You can also drill down to view more detailed metrics, or seamlessly switch to view the corresponding logs, application traces, and uptime information. Initially, the *Inventory* tab shows an overview of the hosts in of your infrastructure and the current CPU usage for each host. -From here, you can drill down into areas of interest. +From here, you can view other metrics or drill down into areas of interest. [role="screenshot"] image::infrastructure/images/infra-sysmon.png[Infrastructure Overview in Kibana] diff --git a/docs/infrastructure/metrics-explorer.asciidoc b/docs/infrastructure/metrics-explorer.asciidoc index 2919eaa976d6a..c20718dac1c7a 100644 --- a/docs/infrastructure/metrics-explorer.asciidoc +++ b/docs/infrastructure/metrics-explorer.asciidoc @@ -15,7 +15,7 @@ image::infrastructure/images/metrics-explorer-screen.png[Metrics Explorer in Kib * Metrics Explorer uses data collected from {metricbeat-ref}/metricbeat-overview.html[Metricbeat]. * You need read permissions on `metricbeat-*` or the metric index specified in the Metrics configuration. -* Metrics Explorer uses the timestamp field set in the Infrastructure configuration. +* Metrics Explorer uses the timestamp field from the *Settings* tab. By default that is set to `@timestamp`. * The interval for the X Axis is set to `auto`. The bucket size is determined by the time range. diff --git a/docs/logs/using.asciidoc b/docs/logs/using.asciidoc index 65693f4399e53..916ad42a6d221 100644 --- a/docs/logs/using.asciidoc +++ b/docs/logs/using.asciidoc @@ -17,7 +17,7 @@ image::logs/images/logs-console.png[Logs Console in Kibana] Use the search bar to perform ad hoc searches for specific text. You can also create structured queries using {kibana-ref}/kuery-query.html[Kibana Query Language]. For example, enter `host.hostname : "host1"` to see only the information for `host1`. -// ++ this isn't quite the same as the corresponding infrastructure description now. +// ++ this isn't quite the same as the corresponding metrics description now. [float] [[logs-configure-source]] diff --git a/docs/maps/trouble-shooting.asciidoc b/docs/maps/trouble-shooting.asciidoc index 542138828530b..76383f8953a78 100644 --- a/docs/maps/trouble-shooting.asciidoc +++ b/docs/maps/trouble-shooting.asciidoc @@ -30,4 +30,9 @@ image::maps/images/inspector.png[] * Ensure your tile server has configured https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS[Cross-Origin Resource Sharing (CORS)] so tile requests from your Kibana domain have permission to access your tile server domain. * Ensure tiles have the required coordinate system. Vector data must use EPSG:4326 and tiles must use EPSG:3857. +[float] +==== Coordinate and region map visualizations not available in New Visualization menu + +Kibana’s out-of-the-box settings no longer offers coordinate and region maps as a choice in the New Visualization menu because you can create these maps in *Elastic Maps*. +If you want to create new coordinate and region map visualizations, set `xpack.maps.showMapVisualizationTypes` to `true`. diff --git a/docs/redirects.asciidoc b/docs/redirects.asciidoc index a8d8a66fd182c..af67ff70c81b5 100644 --- a/docs/redirects.asciidoc +++ b/docs/redirects.asciidoc @@ -35,3 +35,7 @@ This page has moved. Please see <>. This page has moved. Please see <>. +[role="exclude",id="extend"] +== Extend your use case + +This page was deleted. See <> and <>. \ No newline at end of file diff --git a/docs/settings/general-infra-logs-ui-settings.asciidoc b/docs/settings/general-infra-logs-ui-settings.asciidoc index 31a12c6e2e905..7b32372a1f59a 100644 --- a/docs/settings/general-infra-logs-ui-settings.asciidoc +++ b/docs/settings/general-infra-logs-ui-settings.asciidoc @@ -1,4 +1,4 @@ -`xpack.infra.enabled`:: Set to `false` to disable the Logs and Metrics UI plugin {kib}. Defaults to `true`. +`xpack.infra.enabled`:: Set to `false` to disable the Logs and Metrics app plugin {kib}. Defaults to `true`. `xpack.infra.sources.default.logAlias`:: Index pattern for matching indices that contain log data. Defaults to `filebeat-*,kibana_sample_data_logs*`. To match multiple wildcard patterns, use a comma to separate the names, with no space after the comma. For example, `logstash-app1-*,default-logs-*`. @@ -6,7 +6,7 @@ `xpack.infra.sources.default.fields.timestamp`:: Timestamp used to sort log entries. Defaults to `@timestamp`. -`xpack.infra.sources.default.fields.message`:: Fields used to display messages in the Logs UI. Defaults to `['message', '@message']`. +`xpack.infra.sources.default.fields.message`:: Fields used to display messages in the Logs app. Defaults to `['message', '@message']`. `xpack.infra.sources.default.fields.tiebreaker`:: Field used to break ties between two entries with the same timestamp. Defaults to `_doc`. diff --git a/docs/settings/infrastructure-ui-settings.asciidoc b/docs/settings/infrastructure-ui-settings.asciidoc index 1617f2847c50e..ed69c27feab72 100644 --- a/docs/settings/infrastructure-ui-settings.asciidoc +++ b/docs/settings/infrastructure-ui-settings.asciidoc @@ -1,14 +1,14 @@ [role="xpack"] [[infrastructure-ui-settings-kb]] -=== Metrics UI settings in Kibana +=== Metrics settings in Kibana ++++ -Metrics UI settings +Metrics settings ++++ -You do not need to configure any settings to use the Metrics UI. It is enabled by default. +You do not need to configure any settings to use the Metrics app in {kib}. It is enabled by default. [float] [[general-infra-ui-settings-kb]] -==== General Metrics UI settings +==== General Metrics settings include::general-infra-logs-ui-settings.asciidoc[] \ No newline at end of file diff --git a/docs/settings/logs-ui-settings.asciidoc b/docs/settings/logs-ui-settings.asciidoc index a2c9e12e22fb0..5b6dd902091ae 100644 --- a/docs/settings/logs-ui-settings.asciidoc +++ b/docs/settings/logs-ui-settings.asciidoc @@ -1,14 +1,14 @@ [role="xpack"] [[logs-ui-settings-kb]] -=== Logs UI settings in Kibana +=== Logs app settings in Kibana ++++ -Logs UI settings +Logs settings ++++ -You do not need to configure any settings to use the Logs UI. It is enabled by default. +You do not need to configure any settings to use the Logs app in {kib}. It is enabled by default. [float] [[general-logs-ui-settings-kb]] -==== General Logs UI settings +==== General Logs settings include::general-infra-logs-ui-settings.asciidoc[] diff --git a/docs/uptime-guide/overview.asciidoc b/docs/uptime-guide/overview.asciidoc index 09867e7b05f2a..c6bd71b1f5574 100644 --- a/docs/uptime-guide/overview.asciidoc +++ b/docs/uptime-guide/overview.asciidoc @@ -33,8 +33,8 @@ The {kibana-ref}/xpack-uptime.html[Elasticsearch Uptime app] in Kibana provides [float] === Example deployments -// ++ I like the Infra/logging diagram which shows Infrastructure and Logging apps as separate components inside Kibana -// ++ In diagram, should be Uptime app, not Uptime UI, possibly even Elastic Uptime? Also applies to Infra/logging/APM. +// ++ I like the Infra/logging diagram which shows Metrics and Logging apps as separate components inside Kibana +// ++ In diagram, should be Uptime app, not Uptime UI, possibly even Elastic Uptime? Also applies to Metrics/Logging/APM. // ++ Need more whitespace around components. image::images/uptime-simple-deployment.png[Uptime simple deployment] diff --git a/docs/uptime-guide/security.asciidoc b/docs/uptime-guide/security.asciidoc index 41efcc25627be..2a960348b1e02 100644 --- a/docs/uptime-guide/security.asciidoc +++ b/docs/uptime-guide/security.asciidoc @@ -31,17 +31,6 @@ PUT /_security/role/uptime "allow_restricted_indices" : false } ], - "applications" : [ - { - "application" : "kibana-.kibana", - "privileges" : [ - "all" - ], - "resources" : [ - "*" - ] - } - ], "transient_metadata" : { "enabled" : true } @@ -52,7 +41,8 @@ PUT /_security/role/uptime [float] === Assign the role to a user -Next, you'll need to create a user with both the `kibana_user`, and `uptime` roles. +Next, you'll need to create a user with both the `uptime` role, and another role with sufficient {kibana-ref}/kibana-privileges.html[Kibana privileges], +such as the `kibana_user` role. You can do this with the following request: ["source","sh",subs="attributes,callouts"] diff --git a/docs/uptime/overview.asciidoc b/docs/uptime/overview.asciidoc index ea7047ae940a8..098ce12a56991 100644 --- a/docs/uptime/overview.asciidoc +++ b/docs/uptime/overview.asciidoc @@ -34,7 +34,7 @@ in an `up` or `down` state are displayed, based on the last check reported by He for each monitor. Next to the counts, there is a histogram displaying the change over time throughout the -selected date range. +selected date range. [float] === Monitor list @@ -56,7 +56,7 @@ ID and URL, its IP address, and a dedicated sparkline showing its check status o image::uptime/images/observability_integrations.png[Observability integrations] The Monitor list also contains a menu of possible integrations. If Uptime detects Kubernetes or -Docker related host information, it will provide links to open the Metrics UI or Logs UI pre-filtered +Docker related host information, it will provide links to open the Metrics app or Logs app pre-filtered for this host. Additionally, this feature supplies links to simply filter the other views on the host's IP address, to help you quickly determine if these other solutions contain data relevant to your current interest. diff --git a/docs/user/canvas.asciidoc b/docs/user/canvas.asciidoc index f3aa78e8e2e67..c58635ba97769 100644 --- a/docs/user/canvas.asciidoc +++ b/docs/user/canvas.asciidoc @@ -5,15 +5,15 @@ [partintro] -- -Canvas is a data visualization and presentation tool that sits within Kibana. With Canvas, you can pull live data directly from Elasticsearch, and combine the data with colors, images, text, and your imagination to create dynamic, multi-page, pixel-perfect displays. If you are a little bit creative, a little bit technical, and a whole lot curious, then Canvas is for you. +Canvas is a data visualization and presentation tool that sits within Kibana. With Canvas, you can pull live data directly from Elasticsearch, and combine the data with colors, images, text, and your imagination to create dynamic, multi-page, pixel-perfect displays. If you are a little bit creative, a little bit technical, and a whole lot curious, then Canvas is for you. With Canvas, you can: -* Create and personalize your work space with backgrounds, borders, colors, fonts, and more. +* Create and personalize your work space with backgrounds, borders, colors, fonts, and more. * Customize your workpad with your own visualizations, such as images and text. -* Customize your data by pulling it directly from Elasticsearch. +* Customize your data by pulling it directly from Elasticsearch. * Show off your data with charts, graphs, progress monitors, and more. @@ -37,8 +37,6 @@ include::{kib-repo-dir}/canvas/canvas-present-workpad.asciidoc[] include::{kib-repo-dir}/canvas/canvas-share-workpad.asciidoc[] -//include::{kib-repo-dir}/canvas/canvas-expressions.asciidoc[] - include::{kib-repo-dir}/canvas/canvas-function-reference.asciidoc[] include::{kib-repo-dir}/canvas/canvas-tinymath-functions.asciidoc[] diff --git a/docs/user/extend.asciidoc b/docs/user/extend.asciidoc deleted file mode 100644 index c658731ce3c3d..0000000000000 --- a/docs/user/extend.asciidoc +++ /dev/null @@ -1,15 +0,0 @@ -[[extend]] -= Extend your use case - -[partintro] --- -//TBD - -* <> -* <> - --- - -include::graph/index.asciidoc[] - -include::ml/index.asciidoc[] diff --git a/docs/user/graph/configuring-graph.asciidoc b/docs/user/graph/configuring-graph.asciidoc index 9503e606406b3..d521f9d8d2846 100644 --- a/docs/user/graph/configuring-graph.asciidoc +++ b/docs/user/graph/configuring-graph.asciidoc @@ -1,6 +1,6 @@ [role="xpack"] [[graph-configuration]] -=== Configuring Graph +== Configuring Graph When a user saves a graph workspace in Kibana, it is stored in the `.kibana` index along with other saved objects like visualizations and dashboards. @@ -57,9 +57,9 @@ is displayed. For more information on granting access to Kibana, see [role="screenshot"] image::user/graph/images/graph-read-only-badge.png[Example of Graph's read only access indicator in Kibana's header] -[float] +[discrete] [[disable-drill-down]] -==== Disabling drill down configuration +=== Disabling drill down configuration By default, users can configure _drill down_ URLs to display additional information about a selected vertex in a new browser window. For example, diff --git a/docs/user/graph/getting-started.asciidoc b/docs/user/graph/getting-started.asciidoc index dd5e8527c8976..19f3df341338e 100644 --- a/docs/user/graph/getting-started.asciidoc +++ b/docs/user/graph/getting-started.asciidoc @@ -1,6 +1,6 @@ [role="xpack"] [[graph-getting-started]] -=== Using Graph +== Using Graph Graph is automatically enabled in {es} and {kib}. diff --git a/docs/user/graph/index.asciidoc b/docs/user/graph/index.asciidoc index 9ca7b0e4b1a4a..f9094f5b594b1 100644 --- a/docs/user/graph/index.asciidoc +++ b/docs/user/graph/index.asciidoc @@ -1,7 +1,9 @@ [role="xpack"] [[xpack-graph]] -== Graph data connections += Graph data connections +[partintro] +-- The {graph-features} enable you to discover how items in an Elasticsearch index are related. You can explore the connections between indexed terms and see which connections are the most meaningful. This can be @@ -17,9 +19,9 @@ and an interactive graph visualization tool for Kibana. Both work out of the box with existing Elasticsearch indices--you don't need to store any additional data to use these features. +[discrete] [[how-graph-works]] -[float] -=== How Graph works +== How Graph works The graph API provides an alternative way to extract and summarize information about the documents and terms in your Elasticsearch index. A _graph_ is really just a network of related items. In our case, this means a network of related @@ -62,6 +64,7 @@ multi-node clusters and scales with your Elasticsearch deployment. Advanced options let you control how your data is sampled and summarized. You can also set timeouts to prevent graph queries from adversely affecting the cluster. +-- include::getting-started.asciidoc[] diff --git a/docs/user/graph/limitations.asciidoc b/docs/user/graph/limitations.asciidoc index b40f15000483a..e96910bd27b4c 100644 --- a/docs/user/graph/limitations.asciidoc +++ b/docs/user/graph/limitations.asciidoc @@ -1,12 +1,12 @@ [role="xpack"] [[graph-limitations]] -=== Graph limitations +== Graph limitations ++++ Limitations ++++ -[float] -==== Limited support for multiple indices +[discrete] +=== Limited support for multiple indices The graph API can explore multiple indices, types, or aliases in a single API request, but the assumption is that each "hop" it performs is querying the same set of indices. Currently, it is not possible to diff --git a/docs/user/graph/troubleshooting.asciidoc b/docs/user/graph/troubleshooting.asciidoc index 7a87aba7b7f81..ff3568ed41afa 100644 --- a/docs/user/graph/troubleshooting.asciidoc +++ b/docs/user/graph/troubleshooting.asciidoc @@ -1,12 +1,12 @@ [role="xpack"] [[graph-troubleshooting]] -=== Graph Troubleshooting +== Graph Troubleshooting ++++ Troubleshooting ++++ -[float] -==== Why are results missing? +[discrete] +=== Why are results missing? The default settings in Graph API requests are configured to tune out noisy results by using the following strategies: @@ -29,8 +29,8 @@ of any statistical correlation with the sample. * Set the `min_doc_count` for your vertices to 1 to ensure only one document is required to assert a relationship. -[float] -==== What can I do to to improve performance? +[discrete] +=== What can I do to to improve performance? With the default setting of `use_significance` set to `true`, the Graph API performs a background frequency check of the terms it discovers as part of diff --git a/docs/user/index.asciidoc b/docs/user/index.asciidoc index 4b29255c50a1d..ebe6c10c49872 100644 --- a/docs/user/index.asciidoc +++ b/docs/user/index.asciidoc @@ -16,7 +16,9 @@ include::dashboard.asciidoc[] include::canvas.asciidoc[] -include::extend.asciidoc[] +include::graph/index.asciidoc[] + +include::ml/index.asciidoc[] include::{kib-repo-dir}/maps/index.asciidoc[] diff --git a/docs/user/ml/index.asciidoc b/docs/user/ml/index.asciidoc index a5f14ed2cf944..b7bf459c39d98 100644 --- a/docs/user/ml/index.asciidoc +++ b/docs/user/ml/index.asciidoc @@ -1,7 +1,9 @@ [role="xpack"] [[xpack-ml]] -== {ml-cap} += {ml-cap} +[partintro] +-- 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. Elastic {ml-features} @@ -28,10 +30,10 @@ You need the following permissions to use the Data Visualizer with file upload: For more information, see {ref}/security-privileges.html[Security privileges] and {ref}/built-in-roles.html[Built-in roles]. +-- -[float] [[xpack-ml-anomalies]] -=== {anomaly-detect-cap} +== {anomaly-detect-cap} The Elastic {ml} {anomaly-detect} feature automatically models the normal behavior of your time series data — learning trends, periodicity, and more — in @@ -82,9 +84,8 @@ For more information about the {anomaly-detect} feature, see https://www.elastic.co/what-is/elastic-stack-machine-learning[{ml-cap} in the {stack}] and {stack-ov}/xpack-ml.html[{ml-cap} {anomaly-detect}]. -[float] [[xpack-ml-dfanalytics]] -=== {dfanalytics-cap} +== {dfanalytics-cap} The Elastic {ml} {dfanalytics} feature enables you to analyze your data using {oldetection} and {regression} algorithms and generate new indices that contain @@ -98,4 +99,4 @@ in {kib}. For example: image::user/ml/images/outliers.jpg[{oldetection-cap} results in {kib}] For more information about the {dfanalytics} feature, see -{stack-ov}/ml-dfanalytics.html[{ml-cap} {dfanalytics}]. +{stack-ov}/ml-dfanalytics.html[{ml-cap} {dfanalytics}]. \ No newline at end of file diff --git a/docs/user/reporting/index.asciidoc b/docs/user/reporting/index.asciidoc index 82dd88cb57495..4a5ca41ae6be9 100644 --- a/docs/user/reporting/index.asciidoc +++ b/docs/user/reporting/index.asciidoc @@ -32,8 +32,8 @@ for different operating systems. . Open {kib} in your web browser and log in. If you are running {kib} locally, go to `http://localhost:5601`. To access {kib} and generate -reports, you need the `kibana_user` and `reporting_user` roles. For more -information, see <>. +reports, you need the `reporting_user` role, and an additional role with succifient <>, such as the `kibana_user` role. +For more information, see <>. . Open the dashboard, visualization, or saved search you want to include in the report. diff --git a/docs/user/security/authentication/index.asciidoc b/docs/user/security/authentication/index.asciidoc index 8a4678e051490..c2b1adc5e1b92 100644 --- a/docs/user/security/authentication/index.asciidoc +++ b/docs/user/security/authentication/index.asciidoc @@ -138,7 +138,7 @@ xpack.security.authc.saml.maxRedirectURLSize: 1kb ==== OpenID Connect Single Sign-On Similar to SAML, authentication with OpenID Connect allows users to log in to {kib} using an OpenID Connect Provider such as Google, or Okta. OpenID Connect -should also be configured in {es}, see {xpack-ref}/saml-guide.html[Configuring OpenID Connect Single-Sign-On on the Elastic Stack] for more details. +should also be configured in {es}. For more details, see {ref}/oidc-guide.html[Configuring single sign-on to the {stack} using OpenID Connect]. Set the configuration values in `kibana.yml` as follows: diff --git a/docs/user/security/reporting.asciidoc b/docs/user/security/reporting.asciidoc index ffbef3bdc9b18..1d7a3f4978ee0 100644 --- a/docs/user/security/reporting.asciidoc +++ b/docs/user/security/reporting.asciidoc @@ -19,7 +19,7 @@ and `kibana_user` roles: * If you're using the `native` realm, you can assign roles through **Management / Users** UI in Kibana or with the `user` API. For example, the following request creates a `reporter` user that has the -`reporting_user` and `kibana_user` roles: +`reporting_user` role, and another role with sufficient <>, such as the `kibana_user` role: + [source, sh] --------------------------------------------------------------- diff --git a/docs/user/security/securing-kibana.asciidoc b/docs/user/security/securing-kibana.asciidoc index fa11d5925bdbe..1c74bd98642a7 100644 --- a/docs/user/security/securing-kibana.asciidoc +++ b/docs/user/security/securing-kibana.asciidoc @@ -117,7 +117,7 @@ user you've assigned a {kib} user role. For example, you could log in as the + -- -NOTE: This must be a user who has been assigned the `kibana_user` role. +NOTE: This must be a user who has been assigned <>. {kib} server credentials should only be used internally by the {kib} server. -- diff --git a/docs/visualize/regionmap.asciidoc b/docs/visualize/regionmap.asciidoc index faecc207d81a7..c39282963ef7b 100644 --- a/docs/visualize/regionmap.asciidoc +++ b/docs/visualize/regionmap.asciidoc @@ -1,9 +1,12 @@ [[regionmap]] == Region Maps -Region maps are thematic maps in which boundary vector shapes are colored using a gradient: -higher intensity colors indicate larger values, and lower intensity colors indicate smaller values. -These are also known as choropleth maps. +Region maps are thematic maps in which boundary vector shapes are colored using a gradient: +higher intensity colors indicate larger values, and lower intensity colors indicate smaller values. +These are also known as choropleth maps. + +Kibana’s out-of-the-box settings do not show a region map in the New Visualization menu. Use <> instead, which offers more functionality and is easier to use. +If you want to create new region map visualizations, set `xpack.maps.showMapVisualizationTypes` to `true`. image::images/regionmap.png[] @@ -11,7 +14,7 @@ image::images/regionmap.png[] [[regionmap-configuration]] === Configuration -To create a region map, you configure an inner join that joins the result of an Elasticsearch terms aggregation +To create a region map, you configure an inner join that joins the result of an Elasticsearch terms aggregation and a reference vector file based on a shared key. [float] @@ -23,7 +26,7 @@ and a reference vector file based on a shared key. Select any of the supported _Metric_ or _Sibling Pipeline Aggregations_. [float] -===== Buckets +===== Buckets Configure a _Terms_ aggregation. The term is the _key_ that is used to join the results to the vector data on the map. @@ -35,7 +38,7 @@ Configure a _Terms_ aggregation. The term is the _key_ that is used to join the - *Vector map*: select from a list of vector maps. This list includes the maps that are hosted by the © https://www.elastic.co/elastic-maps-service[Elastic Maps Service], as well as your self-hosted layers that are configured in the *config/kibana.yml* file. To learn more about how to configure Kibana to make self-hosted layers available, see the <> documentation. You can also explore and preview vector layers available in Elastic Maps Service at https://maps.elastic.co[https://maps.elastic.co]. -- *Join field*: this is the property from the selected vector map that will be used to join on the terms in your terms-aggregation. +- *Join field*: this is the property from the selected vector map that will be used to join on the terms in your terms-aggregation. When terms cannot be joined to any of the shapes in the vector layer because there is no exact match in the vector layer, Kibana will display a warning. To turn of these warnings, go to *Management/Kibana/Advanced Settings* and set `visualization:regionmap:showWarnings` to `false`. @@ -46,4 +49,4 @@ To turn of these warnings, go to *Management/Kibana/Advanced Settings* and set ` [float] ===== Basic Settings - *Legend Position*: the location on the screen where the legend should be rendered. -- *Show Tooltip*: indicates whether a tooltip should be displayed when hovering over a shape.. \ No newline at end of file +- *Show Tooltip*: indicates whether a tooltip should be displayed when hovering over a shape.. diff --git a/docs/visualize/tilemap.asciidoc b/docs/visualize/tilemap.asciidoc index 157eb502bedb7..0e89704b8ba0b 100644 --- a/docs/visualize/tilemap.asciidoc +++ b/docs/visualize/tilemap.asciidoc @@ -3,7 +3,10 @@ A coordinate map displays a geographic area overlaid with circles keyed to the data determined by the buckets you specify. -NOTE: By default, Kibana uses the https://www.elastic.co/elastic-maps-service[Elastic Maps Service] +Kibana’s out-of-the-box settings do not show a coordinate map in the New Visualization menu. Use <> instead, which offers more functionality and is easier to use. +If you want to create new coordinate map visualizations, set `xpack.maps.showMapVisualizationTypes` to `true`. + +Kibana uses the https://www.elastic.co/elastic-maps-service[Elastic Maps Service] to display map tiles. To use other tile service providers, configure the <> in `kibana.yml`. diff --git a/package.json b/package.json index 492f5744b24c7..1b807fa94f0db 100644 --- a/package.json +++ b/package.json @@ -106,10 +106,10 @@ "dependencies": { "@babel/core": "^7.5.5", "@babel/register": "^7.5.5", - "@elastic/charts": "^13.5.9", + "@elastic/charts": "^13.5.12", "@elastic/datemath": "5.0.2", "@elastic/ems-client": "1.0.5", - "@elastic/eui": "14.7.0", + "@elastic/eui": "14.8.0", "@elastic/filesaver": "1.1.2", "@elastic/good": "8.1.1-kibana2", "@elastic/numeral": "2.3.3", @@ -158,8 +158,8 @@ "d3": "3.5.17", "d3-cloud": "1.2.5", "del": "^5.1.0", - "elasticsearch": "^16.4.0", - "elasticsearch-browser": "^16.4.0", + "elasticsearch": "^16.5.0", + "elasticsearch-browser": "^16.5.0", "encode-uri-query": "1.0.1", "execa": "^3.2.0", "expiry-js": "0.1.7", @@ -235,7 +235,7 @@ "reselect": "^3.0.1", "resize-observer-polyfill": "^1.5.0", "rison-node": "1.0.2", - "rxjs": "^6.2.1", + "rxjs": "^6.5.3", "script-loader": "0.7.2", "semver": "^5.5.0", "style-it": "^2.1.3", @@ -352,6 +352,7 @@ "@typescript-eslint/parser": "^2.5.0", "angular-mocks": "^1.7.8", "archiver": "^3.1.1", + "axe-core": "^3.3.2", "babel-eslint": "^10.0.3", "babel-jest": "^24.9.0", "babel-plugin-dynamic-import-node": "^2.3.0", @@ -361,7 +362,7 @@ "chance": "1.0.18", "cheerio": "0.22.0", "chokidar": "3.2.1", - "chromedriver": "^77.0.0", + "chromedriver": "^78.0.1", "classnames": "2.2.6", "dedent": "^0.7.0", "delete-empty": "^2.0.0", diff --git a/packages/eslint-config-kibana/.eslintrc.js b/packages/eslint-config-kibana/.eslintrc.js index 4412ce81368a1..36f0b95c8e69b 100644 --- a/packages/eslint-config-kibana/.eslintrc.js +++ b/packages/eslint-config-kibana/.eslintrc.js @@ -3,6 +3,7 @@ module.exports = { './javascript.js', './typescript.js', './jest.js', + './react.js', ], plugins: ['@kbn/eslint-plugin-eslint'], diff --git a/packages/eslint-config-kibana/javascript.js b/packages/eslint-config-kibana/javascript.js index 8462da5cac801..0c79669c15e73 100644 --- a/packages/eslint-config-kibana/javascript.js +++ b/packages/eslint-config-kibana/javascript.js @@ -1,6 +1,3 @@ -const semver = require('semver'); -const { readdirSync } = require('fs'); -const PKG = require('../../package.json'); const RESTRICTED_GLOBALS = require('./restricted_globals'); const RESTRICTED_MODULES = { paths: ['gulp-util'] }; @@ -16,18 +13,12 @@ module.exports = { plugins: [ 'mocha', 'babel', - 'react', - 'react-hooks', 'import', 'no-unsanitized', 'prefer-object-spread', - 'jsx-a11y', ], settings: { - react: { - version: semver.valid(semver.coerce(PKG.dependencies.react)), - }, 'import/resolver': { '@kbn/eslint-import-resolver-kibana': { forceNode: true, @@ -120,64 +111,6 @@ module.exports = { 'object-curly-spacing': 'off', // overridden with babel/object-curly-spacing 'babel/object-curly-spacing': [ 'error', 'always' ], - 'jsx-quotes': ['error', 'prefer-double'], - 'react/jsx-uses-react': 'error', - 'react/react-in-jsx-scope': 'error', - 'react/jsx-uses-vars': 'error', - 'react/jsx-no-undef': 'error', - 'react/jsx-pascal-case': 'error', - 'react/jsx-closing-bracket-location': ['error', 'line-aligned'], - 'react/jsx-closing-tag-location': 'error', - 'react/jsx-curly-spacing': ['error', 'never', { allowMultiline: true }], - 'react/jsx-indent-props': ['error', 2], - 'react/jsx-max-props-per-line': ['error', { maximum: 1, when: 'multiline' }], - 'react/jsx-no-duplicate-props': ['error', { ignoreCase: true }], - 'react/no-danger': 'error', - 'react/self-closing-comp': 'error', - 'react/jsx-wrap-multilines': ['error', { - declaration: true, - assignment: true, - return: true, - arrow: true, - }], - 'react/jsx-first-prop-new-line': ['error', 'multiline-multiprop'], - 'react-hooks/rules-of-hooks': 'error', // Checks rules of Hooks - 'react-hooks/exhaustive-deps': 'warn', // Checks effect dependencies - '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', - 'jsx-a11y/label-has-associated-control': 'error', - 'react/jsx-equals-spacing': ['error', 'never'], - 'react/jsx-indent': ['error', 2], - 'react/no-will-update-set-state': 'error', - 'react/no-is-mounted': 'error', - 'react/no-multi-comp': ['error', { ignoreStateless: true }], - 'react/no-unknown-property': 'error', - 'react/prefer-es6-class': ['error', 'always'], - 'react/prefer-stateless-function': ['error', { ignorePureComponents: true }], - 'react/no-unescaped-entities': 'error', - 'mocha/handle-done-callback': 'error', 'mocha/no-exclusive-tests': 'error', diff --git a/packages/eslint-config-kibana/react.js b/packages/eslint-config-kibana/react.js new file mode 100644 index 0000000000000..163bd6ca73a07 --- /dev/null +++ b/packages/eslint-config-kibana/react.js @@ -0,0 +1,84 @@ +const semver = require('semver') +const PKG = require('../../package.json') + +module.exports = { + plugins: [ + 'react', + 'react-hooks', + 'jsx-a11y', + ], + + parserOptions: { + ecmaFeatures: { + jsx: true + } + }, + + settings: { + react: { + version: semver.valid(semver.coerce(PKG.dependencies.react)), + }, + }, + + rules: { + 'jsx-quotes': ['error', 'prefer-double'], + 'react/jsx-uses-react': 'error', + 'react/react-in-jsx-scope': 'error', + 'react/jsx-uses-vars': 'error', + 'react/jsx-no-undef': 'error', + 'react/jsx-pascal-case': 'error', + 'react/jsx-closing-bracket-location': ['error', 'line-aligned'], + 'react/jsx-closing-tag-location': 'error', + 'react/jsx-curly-spacing': ['error', 'never', { allowMultiline: true }], + 'react/jsx-indent-props': ['error', 2], + 'react/jsx-max-props-per-line': ['error', { maximum: 1, when: 'multiline' }], + 'react/jsx-no-duplicate-props': ['error', { ignoreCase: true }], + 'react/no-danger': 'error', + 'react/self-closing-comp': 'error', + 'react/jsx-wrap-multilines': ['error', { + declaration: true, + assignment: true, + return: true, + arrow: true, + }], + 'react/jsx-first-prop-new-line': ['error', 'multiline-multiprop'], + 'react-hooks/rules-of-hooks': 'error', // Checks rules of Hooks + 'react-hooks/exhaustive-deps': 'error', // Checks effect dependencies + '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/click-events-have-key-events': '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/label-has-associated-control': '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-onchange': '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', + 'react/no-is-mounted': 'error', + 'react/no-multi-comp': ['error', { ignoreStateless: true }], + 'react/no-unknown-property': 'error', + 'react/prefer-es6-class': ['error', 'always'], + 'react/prefer-stateless-function': ['error', { ignorePureComponents: true }], + 'react/no-unescaped-entities': 'error', + }, +} diff --git a/packages/eslint-config-kibana/typescript.js b/packages/eslint-config-kibana/typescript.js index 7653c9bb0c332..757616f36180b 100644 --- a/packages/eslint-config-kibana/typescript.js +++ b/packages/eslint-config-kibana/typescript.js @@ -18,7 +18,6 @@ module.exports = { '@typescript-eslint', 'ban', 'import', - 'jsx-a11y', 'prefer-object-spread', ], @@ -171,33 +170,6 @@ module.exports = { {'name': ['test', 'only'], 'message': 'No exclusive tests.'}, ], - '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/click-events-have-key-events': '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-onchange': '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', - 'jsx-a11y/label-has-associated-control': 'error', 'import/no-default-export': 'error', }, eslintConfigPrettierTypescriptEslintRules diff --git a/packages/kbn-babel-preset/node_preset.js b/packages/kbn-babel-preset/node_preset.js index 5ef4219df59f7..793044e3796ea 100644 --- a/packages/kbn-babel-preset/node_preset.js +++ b/packages/kbn-babel-preset/node_preset.js @@ -18,6 +18,25 @@ */ module.exports = (_, options = {}) => { + const overrides = []; + if (!process.env.ALLOW_PERFORMANCE_HOOKS_IN_TASK_MANAGER) { + overrides.push( + { + test: [/x-pack[\/\\]legacy[\/\\]plugins[\/\\]task_manager/], + plugins: [ + [ + require.resolve('babel-plugin-filter-imports'), + { + imports: { + perf_hooks: ['performance'], + }, + }, + ], + ], + } + ); + } + return { presets: [ [ @@ -39,7 +58,7 @@ module.exports = (_, options = {}) => { modules: 'cjs', corejs: 3, - ...(options['@babel/preset-env'] || {}) + ...(options['@babel/preset-env'] || {}), }, ], require('./common_preset'), @@ -48,9 +67,10 @@ module.exports = (_, options = {}) => { [ require.resolve('babel-plugin-transform-define'), { - 'global.__BUILT_WITH_BABEL__': 'true' - } - ] - ] + 'global.__BUILT_WITH_BABEL__': 'true', + }, + ], + ], + overrides, }; }; diff --git a/packages/kbn-babel-preset/package.json b/packages/kbn-babel-preset/package.json index 4b18357745360..c22cf175b29e5 100644 --- a/packages/kbn-babel-preset/package.json +++ b/packages/kbn-babel-preset/package.json @@ -8,10 +8,11 @@ "@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/plugin-transform-modules-commonjs": "^7.5.0", "@babel/preset-env": "^7.5.5", - "@babel/preset-react":"^7.0.0", + "@babel/preset-react": "^7.0.0", "@babel/preset-typescript": "^7.3.3", "@kbn/elastic-idx": "1.0.0", "babel-plugin-add-module-exports": "^1.0.2", + "babel-plugin-filter-imports": "^3.0.0", "babel-plugin-transform-define": "^1.3.1", "babel-plugin-typescript-strip-namespaces": "^1.1.1" } diff --git a/packages/kbn-dev-utils/package.json b/packages/kbn-dev-utils/package.json index a5789a0a105b3..e8781f6d901d9 100644 --- a/packages/kbn-dev-utils/package.json +++ b/packages/kbn-dev-utils/package.json @@ -16,7 +16,7 @@ "exit-hook": "^2.2.0", "getopts": "^2.2.5", "moment": "^2.24.0", - "rxjs": "^6.2.1", + "rxjs": "^6.5.3", "tree-kill": "^1.2.1", "tslib": "^1.9.3" }, diff --git a/packages/kbn-dev-utils/src/proc_runner/proc.ts b/packages/kbn-dev-utils/src/proc_runner/proc.ts index dab69de47af61..c899293191f2a 100644 --- a/packages/kbn-dev-utils/src/proc_runner/proc.ts +++ b/packages/kbn-dev-utils/src/proc_runner/proc.ts @@ -100,9 +100,9 @@ export function startProc(name: string, options: ProcOptions, log: ToolingLog) { const outcome$: Rx.Observable = Rx.race( // observe first exit event - Rx.fromEvent(childProcess, 'exit').pipe( + Rx.fromEvent<[number]>(childProcess, 'exit').pipe( take(1), - map(([code]: [number]) => { + map(([code]) => { if (stopCalled) { return null; } diff --git a/packages/kbn-es-query/src/__fixtures__/index_pattern_response.json b/packages/kbn-es-query/src/__fixtures__/index_pattern_response.json index 408e839596ae2..588e6ada69cfe 100644 --- a/packages/kbn-es-query/src/__fixtures__/index_pattern_response.json +++ b/packages/kbn-es-query/src/__fixtures__/index_pattern_response.json @@ -161,8 +161,7 @@ "searchable": true, "aggregatable": true, "readFromDocValues": true, - "parent": "machine.os", - "subType": "multi" + "subType": { "multi": { "parent": "machine.os" } } }, { "name": "geo.src", @@ -277,6 +276,28 @@ "searchable": true, "aggregatable": true, "readFromDocValues": false + }, + { + "name": "nestedField.child", + "type": "string", + "esTypes": ["text"], + "count": 0, + "scripted": false, + "searchable": true, + "aggregatable": false, + "readFromDocValues": false, + "subType": { "nested": { "path": "nestedField" } } + }, + { + "name": "nestedField.nestedChild.doublyNestedChild", + "type": "string", + "esTypes": ["text"], + "count": 0, + "scripted": false, + "searchable": true, + "aggregatable": false, + "readFromDocValues": false, + "subType": { "nested": { "path": "nestedField.nestedChild" } } } ] } diff --git a/packages/kbn-es-query/src/es_query/migrate_filter.js b/packages/kbn-es-query/src/es_query/migrate_filter.js index d5f52648b027e..b74fc485a6184 100644 --- a/packages/kbn-es-query/src/es_query/migrate_filter.js +++ b/packages/kbn-es-query/src/es_query/migrate_filter.js @@ -18,7 +18,7 @@ */ import _ from 'lodash'; -import { getConvertedValueForField } from '../filters'; +import { getConvertedValueForField } from '../utils/filters'; export function migrateFilter(filter, indexPattern) { if (filter.match) { diff --git a/packages/kbn-es-query/src/filters/__tests__/phrase.js b/packages/kbn-es-query/src/filters/__tests__/phrase.js deleted file mode 100644 index dbd794a018d9e..0000000000000 --- a/packages/kbn-es-query/src/filters/__tests__/phrase.js +++ /dev/null @@ -1,92 +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 { buildInlineScriptForPhraseFilter, buildPhraseFilter } from '../phrase'; -import expect from '@kbn/expect'; -import _ from 'lodash'; -import indexPattern from '../../__fixtures__/index_pattern_response.json'; -import filterSkeleton from '../../__fixtures__/filter_skeleton'; - -let expected; - -describe('Filter Manager', function () { - describe('Phrase filter builder', function () { - beforeEach(() => { - expected = _.cloneDeep(filterSkeleton); - }); - - it('should be a function', function () { - expect(buildPhraseFilter).to.be.a(Function); - }); - - it('should return a match query filter when passed a standard field', function () { - const field = getField(indexPattern, 'bytes'); - expected.query = { - match_phrase: { - bytes: 5 - } - }; - expect(buildPhraseFilter(field, 5, indexPattern)).to.eql(expected); - }); - - it('should return a script filter when passed a scripted field', function () { - const field = getField(indexPattern, 'script number'); - expected.meta.field = 'script number'; - _.set(expected, 'script.script', { - source: '(' + field.script + ') == value', - lang: 'expression', - params: { - value: 5, - } - }); - expect(buildPhraseFilter(field, 5, indexPattern)).to.eql(expected); - }); - }); - - describe('buildInlineScriptForPhraseFilter', function () { - - it('should wrap painless scripts in a lambda', function () { - const field = { - lang: 'painless', - script: 'return foo;', - }; - - const expected = `boolean compare(Supplier s, def v) {return s.get() == v;}` + - `compare(() -> { return foo; }, params.value);`; - - expect(buildInlineScriptForPhraseFilter(field)).to.be(expected); - }); - - it('should create a simple comparison for other langs', function () { - const field = { - lang: 'expression', - script: 'doc[bytes].value', - }; - - const expected = `(doc[bytes].value) == value`; - - expect(buildInlineScriptForPhraseFilter(field)).to.be(expected); - }); - }); -}); - -function getField(indexPattern, name) { - return indexPattern.fields.find(field => field.name === name); -} diff --git a/packages/kbn-es-query/src/filters/__tests__/query.js b/packages/kbn-es-query/src/filters/__tests__/query.js deleted file mode 100644 index 8b774f05c29d3..0000000000000 --- a/packages/kbn-es-query/src/filters/__tests__/query.js +++ /dev/null @@ -1,46 +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 { buildQueryFilter } from '../query'; -import { cloneDeep } from 'lodash'; -import expect from '@kbn/expect'; -import indexPattern from '../../__fixtures__/index_pattern_response.json'; -import filterSkeleton from '../../__fixtures__/filter_skeleton'; - -let expected; - -describe('Filter Manager', function () { - describe('Phrase filter builder', function () { - beforeEach(() => { - expected = cloneDeep(filterSkeleton); - }); - - it('should be a function', function () { - expect(buildQueryFilter).to.be.a(Function); - }); - - it('should return a query filter when passed a standard field', function () { - expected.query = { - foo: 'bar' - }; - expect(buildQueryFilter({ foo: 'bar' }, indexPattern.id)).to.eql(expected); - }); - - }); -}); diff --git a/packages/kbn-es-query/src/filters/__tests__/range.js b/packages/kbn-es-query/src/filters/__tests__/range.js deleted file mode 100644 index 9b23fc23908d4..0000000000000 --- a/packages/kbn-es-query/src/filters/__tests__/range.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 { buildRangeFilter } from '../range'; -import expect from '@kbn/expect'; -import _ from 'lodash'; -import indexPattern from '../../__fixtures__/index_pattern_response.json'; -import filterSkeleton from '../../__fixtures__/filter_skeleton'; - -let expected; - -describe('Filter Manager', function () { - describe('Range filter builder', function () { - beforeEach(() => { - expected = _.cloneDeep(filterSkeleton); - }); - - it('should be a function', function () { - expect(buildRangeFilter).to.be.a(Function); - }); - - it('should return a range filter when passed a standard field', function () { - const field = getField(indexPattern, 'bytes'); - expected.range = { - bytes: { - gte: 1, - lte: 3 - } - }; - expect(buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern)).to.eql(expected); - }); - - it('should return a script filter when passed a scripted field', function () { - const field = getField(indexPattern, 'script number'); - expected.meta.field = 'script number'; - _.set(expected, 'script.script', { - lang: 'expression', - source: '(' + field.script + ')>=gte && (' + field.script + ')<=lte', - params: { - value: '>=1 <=3', - gte: 1, - lte: 3 - } - }); - expect(buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern)).to.eql(expected); - }); - - it('should wrap painless scripts in comparator lambdas', function () { - const field = getField(indexPattern, 'script date'); - const expected = `boolean gte(Supplier s, def v) {return !s.get().toInstant().isBefore(Instant.parse(v))} ` + - `boolean lte(Supplier s, def v) {return !s.get().toInstant().isAfter(Instant.parse(v))}` + - `gte(() -> { ${field.script} }, params.gte) && ` + - `lte(() -> { ${field.script} }, params.lte)`; - - const inlineScript = buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern).script.script.source; - expect(inlineScript).to.be(expected); - }); - - it('should throw an error when gte and gt, or lte and lt are both passed', function () { - const field = getField(indexPattern, 'script number'); - expect(function () { - buildRangeFilter(field, { gte: 1, gt: 3 }, indexPattern); - }).to.throwError(); - expect(function () { - buildRangeFilter(field, { lte: 1, lt: 3 }, indexPattern); - }).to.throwError(); - }); - - it('to use the right operator for each of gte, gt, lt and lte', function () { - const field = getField(indexPattern, 'script number'); - _.each({ gte: '>=', gt: '>', lte: '<=', lt: '<' }, function (operator, key) { - const params = {}; - params[key] = 5; - const filter = buildRangeFilter(field, params, indexPattern); - - expect(filter.script.script.source).to.be( - '(' + field.script + ')' + operator + key); - expect(filter.script.script.params[key]).to.be(5); - expect(filter.script.script.params.value).to.be(operator + 5); - - }); - }); - - describe('when given params where one side is infinite', function () { - const field = getField(indexPattern, 'script number'); - let filter; - beforeEach(function () { - filter = buildRangeFilter(field, { gte: 0, lt: Infinity }, indexPattern); - }); - - describe('returned filter', function () { - it('is a script filter', function () { - expect(filter).to.have.property('script'); - }); - - it('contain a param for the finite side', function () { - expect(filter.script.script.params).to.have.property('gte', 0); - }); - - it('does not contain a param for the infinite side', function () { - expect(filter.script.script.params).not.to.have.property('lt'); - }); - - it('does not contain a script condition for the infinite side', function () { - const field = getField(indexPattern, 'script number'); - const script = field.script; - expect(filter.script.script.source).to.equal(`(${script})>=gte`); - }); - }); - }); - - describe('when given params where both sides are infinite', function () { - const field = getField(indexPattern, 'script number'); - let filter; - beforeEach(function () { - filter = buildRangeFilter( - field, { gte: -Infinity, lt: Infinity }, indexPattern); - }); - - describe('returned filter', function () { - it('is a match_all filter', function () { - expect(filter).not.to.have.property('script'); - expect(filter).to.have.property('match_all'); - }); - - it('does not contain params', function () { - expect(filter).not.to.have.property('params'); - }); - - it('meta field is set to field name', function () { - expect(filter.meta.field).to.equal('script number'); - }); - }); - }); - }); -}); - -function getField(indexPattern, name) { - return indexPattern.fields.find(field => field.name === name); -} diff --git a/packages/kbn-es-query/src/filters/index.d.ts b/packages/kbn-es-query/src/filters/index.d.ts deleted file mode 100644 index c05e32dbf07b9..0000000000000 --- a/packages/kbn-es-query/src/filters/index.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 { CustomFilter, ExistsFilter, PhraseFilter, PhrasesFilter, RangeFilter } from './lib'; -import { RangeFilterParams } from './lib/range_filter'; - -export * from './lib'; - -// We can't import the real types from the data plugin, so need to either duplicate -// them here or figure out another solution, perhaps housing them in this package -type Field = any; -type IndexPattern = any; - -export function buildExistsFilter(field: Field, indexPattern: IndexPattern): ExistsFilter; - -export function buildPhraseFilter( - field: Field, - value: string, - indexPattern: IndexPattern -): PhraseFilter; - -export function buildPhrasesFilter( - field: Field, - values: string[], - indexPattern: IndexPattern -): PhrasesFilter; - -export function buildQueryFilter(query: any, index: string, alias?: string): CustomFilter; - -export function buildRangeFilter( - field: Field, - params: RangeFilterParams, - indexPattern: IndexPattern, - formattedValue?: string -): RangeFilter; diff --git a/packages/kbn-es-query/src/filters/index.js b/packages/kbn-es-query/src/filters/index.js deleted file mode 100644 index d7d092eabd8a2..0000000000000 --- a/packages/kbn-es-query/src/filters/index.js +++ /dev/null @@ -1,25 +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 * from './exists'; -export * from './phrase'; -export * from './phrases'; -export * from './query'; -export * from './range'; -export * from './lib'; diff --git a/packages/kbn-es-query/src/filters/lib/index.ts b/packages/kbn-es-query/src/filters/lib/index.ts deleted file mode 100644 index ea02398710341..0000000000000 --- a/packages/kbn-es-query/src/filters/lib/index.ts +++ /dev/null @@ -1,95 +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. - */ - -// The interface the other filters extend -export * from './meta_filter'; - -// The actual filter types -import { CustomFilter } from './custom_filter'; -import { ExistsFilter, isExistsFilter } from './exists_filter'; -import { GeoBoundingBoxFilter, isGeoBoundingBoxFilter } from './geo_bounding_box_filter'; -import { GeoPolygonFilter, isGeoPolygonFilter } from './geo_polygon_filter'; -import { - PhraseFilter, - isPhraseFilter, - isScriptedPhraseFilter, - getPhraseFilterField, - getPhraseFilterValue, -} from './phrase_filter'; -import { PhrasesFilter, isPhrasesFilter } from './phrases_filter'; -import { QueryStringFilter, isQueryStringFilter } from './query_string_filter'; -import { - RangeFilter, - isRangeFilter, - isScriptedRangeFilter, - RangeFilterParams, -} from './range_filter'; -import { MatchAllFilter, isMatchAllFilter } from './match_all_filter'; -import { MissingFilter, isMissingFilter } from './missing_filter'; - -export { - CustomFilter, - ExistsFilter, - isExistsFilter, - GeoBoundingBoxFilter, - isGeoBoundingBoxFilter, - GeoPolygonFilter, - isGeoPolygonFilter, - PhraseFilter, - isPhraseFilter, - isScriptedPhraseFilter, - getPhraseFilterField, - getPhraseFilterValue, - PhrasesFilter, - isPhrasesFilter, - QueryStringFilter, - isQueryStringFilter, - RangeFilter, - isRangeFilter, - isScriptedRangeFilter, - RangeFilterParams, - MatchAllFilter, - isMatchAllFilter, - MissingFilter, - isMissingFilter, -}; - -// Any filter associated with a field (used in the filter bar/editor) -export type FieldFilter = - | ExistsFilter - | GeoBoundingBoxFilter - | GeoPolygonFilter - | PhraseFilter - | PhrasesFilter - | RangeFilter - | MatchAllFilter - | MissingFilter; - -export enum FILTERS { - CUSTOM = 'custom', - PHRASES = 'phrases', - PHRASE = 'phrase', - EXISTS = 'exists', - MATCH_ALL = 'match_all', - MISSING = 'missing', - QUERY_STRING = 'query_string', - RANGE = 'range', - GEO_BOUNDING_BOX = 'geo_bounding_box', - GEO_POLYGON = 'geo_polygon', -} diff --git a/packages/kbn-es-query/src/filters/lib/phrase_filter.ts b/packages/kbn-es-query/src/filters/lib/phrase_filter.ts deleted file mode 100644 index 124a5da372487..0000000000000 --- a/packages/kbn-es-query/src/filters/lib/phrase_filter.ts +++ /dev/null @@ -1,65 +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 { get, isPlainObject } from 'lodash'; -import { Filter, FilterMeta } from './meta_filter'; - -export type PhraseFilterMeta = FilterMeta & { - params: { - query: string; // The unformatted value - }; - script?: { - script: { - params: any; - }; - }; - field?: any; -}; - -export type PhraseFilter = Filter & { - meta: PhraseFilterMeta; -}; - -type PhraseFilterValue = string | number | boolean; - -export const isPhraseFilter = (filter: any): filter is PhraseFilter => { - const isMatchPhraseQuery = filter && filter.query && filter.query.match_phrase; - - const isDeprecatedMatchPhraseQuery = - filter && - filter.query && - filter.query.match && - Object.values(filter.query.match).find((params: any) => params.type === 'phrase'); - - return !!(isMatchPhraseQuery || isDeprecatedMatchPhraseQuery); -}; - -export const isScriptedPhraseFilter = (filter: any): filter is PhraseFilter => - Boolean(get(filter, 'script.script.params.value')); - -export const getPhraseFilterField = (filter: PhraseFilter) => { - const queryConfig = filter.query.match_phrase || filter.query.match; - return Object.keys(queryConfig)[0]; -}; - -export const getPhraseFilterValue = (filter: PhraseFilter): PhraseFilterValue => { - const queryConfig = filter.query.match_phrase || filter.query.match; - const queryValue = Object.values(queryConfig)[0] as any; - return isPlainObject(queryValue) ? queryValue.query : queryValue; -}; diff --git a/packages/kbn-es-query/src/filters/lib/range_filter.ts b/packages/kbn-es-query/src/filters/lib/range_filter.ts deleted file mode 100644 index fc8d05d575d59..0000000000000 --- a/packages/kbn-es-query/src/filters/lib/range_filter.ts +++ /dev/null @@ -1,58 +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 { get, keys } from 'lodash'; -import { Filter, FilterMeta } from './meta_filter'; - -export interface RangeFilterParams { - from?: number | string; - to?: number | string; - gt?: number | string; - lt?: number | string; - gte?: number | string; - lte?: number | string; - format?: string; -} - -export type RangeFilterMeta = FilterMeta & { - params: RangeFilterParams; - field?: any; -}; - -export type RangeFilter = Filter & { - meta: RangeFilterMeta; - script?: { - script: { - params: any; - }; - }; - range: { [key: string]: RangeFilterParams }; -}; - -const hasRangeKeys = (params: RangeFilterParams) => - Boolean( - keys(params).find((key: string) => ['gte', 'gt', 'lte', 'lt', 'from', 'to'].includes(key)) - ); - -export const isRangeFilter = (filter: any): filter is RangeFilter => filter && filter.range; - -export const isScriptedRangeFilter = (filter: any): filter is RangeFilter => { - const params: RangeFilterParams = get(filter, 'script.script.params', {}); - - return hasRangeKeys(params); -}; diff --git a/packages/kbn-es-query/src/filters/phrase.js b/packages/kbn-es-query/src/filters/phrase.js deleted file mode 100644 index f0134f289ad9d..0000000000000 --- a/packages/kbn-es-query/src/filters/phrase.js +++ /dev/null @@ -1,85 +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. - */ - -// Creates an filter where the given field matches the given value -export function buildPhraseFilter(field, value, indexPattern) { - const filter = { meta: { index: indexPattern.id } }; - const convertedValue = getConvertedValueForField(field, value); - - if (field.scripted) { - filter.script = getPhraseScript(field, value); - filter.meta.field = field.name; - } else { - filter.query = { match_phrase: {} }; - filter.query.match_phrase[field.name] = convertedValue; - } - return filter; -} - -export function getPhraseScript(field, value) { - const convertedValue = getConvertedValueForField(field, value); - const script = buildInlineScriptForPhraseFilter(field); - - return { - script: { - source: script, - lang: field.lang, - params: { - value: convertedValue - } - } - }; -} - -// See https://github.com/elastic/elasticsearch/issues/20941 and https://github.com/elastic/kibana/issues/8677 -// and https://github.com/elastic/elasticsearch/pull/22201 -// for the reason behind this change. Aggs now return boolean buckets with a key of 1 or 0. -export function getConvertedValueForField(field, value) { - if (typeof value !== 'boolean' && field.type === 'boolean') { - if ([1, 'true'].includes(value)) { - return true; - } - else if ([0, 'false'].includes(value)) { - return false; - } - else { - throw new Error(`${value} is not a valid boolean value for boolean field ${field.name}`); - } - } - return value; -} - -/** - * Takes a scripted field and returns an inline script appropriate for use in a script query. - * Handles lucene expression and Painless scripts. Other langs aren't guaranteed to generate valid - * scripts. - * - * @param {object} scriptedField A Field object representing a scripted field - * @returns {string} The inline script string - */ -export function buildInlineScriptForPhraseFilter(scriptedField) { - // We must wrap painless scripts in a lambda in case they're more than a simple expression - if (scriptedField.lang === 'painless') { - return `boolean compare(Supplier s, def v) {return s.get() == v;}` + - `compare(() -> { ${scriptedField.script} }, params.value);`; - } - else { - return `(${scriptedField.script}) == value`; - } -} diff --git a/packages/kbn-es-query/src/index.d.ts b/packages/kbn-es-query/src/index.d.ts index ca4455da33f45..c06cef6367fe7 100644 --- a/packages/kbn-es-query/src/index.d.ts +++ b/packages/kbn-es-query/src/index.d.ts @@ -19,4 +19,3 @@ export * from './es_query'; export * from './kuery'; -export * from './filters'; diff --git a/packages/kbn-es-query/src/index.js b/packages/kbn-es-query/src/index.js index 086b2f6db8d0d..963999bd0999b 100644 --- a/packages/kbn-es-query/src/index.js +++ b/packages/kbn-es-query/src/index.js @@ -18,5 +18,4 @@ */ export * from './kuery'; -export * from './filters'; export * from './es_query'; diff --git a/packages/kbn-es-query/src/kuery/ast/__tests__/ast.js b/packages/kbn-es-query/src/kuery/ast/__tests__/ast.js index 1ba10ddca54ac..3cbe1203bc533 100644 --- a/packages/kbn-es-query/src/kuery/ast/__tests__/ast.js +++ b/packages/kbn-es-query/src/kuery/ast/__tests__/ast.js @@ -198,6 +198,68 @@ describe('kuery AST API', function () { expect(actual).to.eql(expected); }); + it('should support nested queries indicated by curly braces', () => { + const expected = nodeTypes.function.buildNode( + 'nested', + 'nestedField', + nodeTypes.function.buildNode('is', 'childOfNested', 'foo') + ); + const actual = ast.fromKueryExpression('nestedField:{ childOfNested: foo }'); + expect(actual).to.eql(expected); + }); + + it('should support nested subqueries and subqueries inside nested queries', () => { + const expected = nodeTypes.function.buildNode( + 'and', + [ + nodeTypes.function.buildNode('is', 'response', '200'), + nodeTypes.function.buildNode( + 'nested', + 'nestedField', + nodeTypes.function.buildNode('or', [ + nodeTypes.function.buildNode('is', 'childOfNested', 'foo'), + nodeTypes.function.buildNode('is', 'childOfNested', 'bar'), + ]) + )]); + const actual = ast.fromKueryExpression('response:200 and nestedField:{ childOfNested:foo or childOfNested:bar }'); + expect(actual).to.eql(expected); + }); + + it('should support nested sub-queries inside paren groups', () => { + const expected = nodeTypes.function.buildNode( + 'and', + [ + nodeTypes.function.buildNode('is', 'response', '200'), + nodeTypes.function.buildNode('or', [ + nodeTypes.function.buildNode( + 'nested', + 'nestedField', + nodeTypes.function.buildNode('is', 'childOfNested', 'foo') + ), + nodeTypes.function.buildNode( + 'nested', + 'nestedField', + nodeTypes.function.buildNode('is', 'childOfNested', 'bar') + ), + ]) + ]); + const actual = ast.fromKueryExpression('response:200 and ( nestedField:{ childOfNested:foo } or nestedField:{ childOfNested:bar } )'); + expect(actual).to.eql(expected); + }); + + it('should support nested groups inside other nested groups', () => { + const expected = nodeTypes.function.buildNode( + 'nested', + 'nestedField', + nodeTypes.function.buildNode( + 'nested', + 'nestedChild', + nodeTypes.function.buildNode('is', 'doublyNestedChild', 'foo') + ) + ); + const actual = ast.fromKueryExpression('nestedField:{ nestedChild:{ doublyNestedChild:foo } }'); + expect(actual).to.eql(expected); + }); }); describe('fromLiteralExpression', function () { diff --git a/packages/kbn-es-query/src/kuery/ast/ast.js b/packages/kbn-es-query/src/kuery/ast/ast.js index 0bf2b258ba1f4..1688995d46f80 100644 --- a/packages/kbn-es-query/src/kuery/ast/ast.js +++ b/packages/kbn-es-query/src/kuery/ast/ast.js @@ -63,12 +63,12 @@ function fromExpression(expression, parseOptions = {}, parse = parseKuery) { * IndexPattern isn't required, but if you pass one in, we can be more intelligent * about how we craft the queries (e.g. scripted fields) */ -export function toElasticsearchQuery(node, indexPattern, config = {}) { +export function toElasticsearchQuery(node, indexPattern, config = {}, context = {}) { if (!node || !node.type || !nodeTypes[node.type]) { return toElasticsearchQuery(nodeTypes.function.buildNode('and', [])); } - return nodeTypes[node.type].toElasticsearchQuery(node, indexPattern, config); + return nodeTypes[node.type].toElasticsearchQuery(node, indexPattern, config, context); } export function doesKueryExpressionHaveLuceneSyntaxError(expression) { diff --git a/packages/kbn-es-query/src/kuery/ast/kuery.js b/packages/kbn-es-query/src/kuery/ast/kuery.js index d39145df79073..f745f01873bae 100644 --- a/packages/kbn-es-query/src/kuery/ast/kuery.js +++ b/packages/kbn-es-query/src/kuery/ast/kuery.js @@ -74,8 +74,30 @@ module.exports = (function() { } return query; }, - peg$c10 = { type: "other", description: "fieldName" }, - peg$c11 = function(field, operator, value) { + peg$c10 = ":", + peg$c11 = { type: "literal", value: ":", description: "\":\"" }, + peg$c12 = "{", + peg$c13 = { type: "literal", value: "{", description: "\"{\"" }, + peg$c14 = "}", + peg$c15 = { type: "literal", value: "}", description: "\"}\"" }, + peg$c16 = function(field, query, trailing) { + if (query.type === 'cursor') { + return { + ...query, + nestedPath: query.nestedPath ? `${field.value}.${query.nestedPath}` : field.value, + } + }; + + if (trailing.type === 'cursor') { + return { + ...trailing, + suggestionTypes: ['conjunction'] + }; + } + return buildFunctionNode('nested', [field, query]); + }, + peg$c17 = { type: "other", description: "fieldName" }, + peg$c18 = function(field, operator, value) { if (value.type === 'cursor') { return { ...value, @@ -85,9 +107,7 @@ module.exports = (function() { const range = buildNamedArgNode(operator, value); return buildFunctionNode('range', [field, range]); }, - peg$c12 = ":", - peg$c13 = { type: "literal", value: ":", description: "\":\"" }, - peg$c14 = function(field, partial) { + peg$c19 = function(field, partial) { if (partial.type === 'cursor') { return { ...partial, @@ -97,7 +117,7 @@ module.exports = (function() { } return partial(field); }, - peg$c15 = function(partial) { + peg$c20 = function(partial) { if (partial.type === 'cursor') { const fieldName = `${partial.prefix}${partial.suffix}`.trim(); return { @@ -109,7 +129,7 @@ module.exports = (function() { const field = buildLiteralNode(null); return partial(field); }, - peg$c16 = function(partial, trailing) { + peg$c21 = function(partial, trailing) { if (trailing.type === 'cursor') { return { ...trailing, @@ -118,7 +138,7 @@ module.exports = (function() { } return partial; }, - peg$c17 = function(partialLeft, partialRight) { + peg$c22 = function(partialLeft, partialRight) { const cursor = [partialLeft, partialRight].find(node => node.type === 'cursor'); if (cursor) { return { @@ -128,7 +148,7 @@ module.exports = (function() { } return (field) => buildFunctionNode('or', [partialLeft(field), partialRight(field)]); }, - peg$c18 = function(partialLeft, partialRight) { + peg$c23 = function(partialLeft, partialRight) { const cursor = [partialLeft, partialRight].find(node => node.type === 'cursor'); if (cursor) { return { @@ -138,7 +158,7 @@ module.exports = (function() { } return (field) => buildFunctionNode('and', [partialLeft(field), partialRight(field)]); }, - peg$c19 = function(partial) { + peg$c24 = function(partial) { if (partial.type === 'cursor') { return { ...list, @@ -147,13 +167,13 @@ module.exports = (function() { } return (field) => buildFunctionNode('not', [partial(field)]); }, - peg$c20 = { type: "other", description: "value" }, - peg$c21 = function(value) { + peg$c25 = { type: "other", description: "value" }, + peg$c26 = function(value) { if (value.type === 'cursor') return value; const isPhrase = buildLiteralNode(true); return (field) => buildFunctionNode('is', [field, value, isPhrase]); }, - peg$c22 = function(value) { + peg$c27 = function(value) { if (value.type === 'cursor') return value; if (!allowLeadingWildcards && value.type === 'wildcard' && nodeTypes.wildcard.hasLeadingWildcard(value)) { @@ -163,19 +183,19 @@ module.exports = (function() { const isPhrase = buildLiteralNode(false); return (field) => buildFunctionNode('is', [field, value, isPhrase]); }, - peg$c23 = { type: "other", description: "OR" }, - peg$c24 = "or", - peg$c25 = { type: "literal", value: "or", description: "\"or\"" }, - peg$c26 = { type: "other", description: "AND" }, - peg$c27 = "and", - peg$c28 = { type: "literal", value: "and", description: "\"and\"" }, - peg$c29 = { type: "other", description: "NOT" }, - peg$c30 = "not", - peg$c31 = { type: "literal", value: "not", description: "\"not\"" }, - peg$c32 = { type: "other", description: "literal" }, - peg$c33 = "\"", - peg$c34 = { type: "literal", value: "\"", description: "\"\\\"\"" }, - peg$c35 = function(prefix, cursor, suffix) { + peg$c28 = { type: "other", description: "OR" }, + peg$c29 = "or", + peg$c30 = { type: "literal", value: "or", description: "\"or\"" }, + peg$c31 = { type: "other", description: "AND" }, + peg$c32 = "and", + peg$c33 = { type: "literal", value: "and", description: "\"and\"" }, + peg$c34 = { type: "other", description: "NOT" }, + peg$c35 = "not", + peg$c36 = { type: "literal", value: "not", description: "\"not\"" }, + peg$c37 = { type: "other", description: "literal" }, + peg$c38 = "\"", + peg$c39 = { type: "literal", value: "\"", description: "\"\\\"\"" }, + peg$c40 = function(prefix, cursor, suffix) { const { start, end } = location(); return { type: 'cursor', @@ -186,17 +206,17 @@ module.exports = (function() { text: text().replace(cursor, '') }; }, - peg$c36 = function(chars) { + peg$c41 = function(chars) { return buildLiteralNode(chars.join('')); }, - peg$c37 = "\\", - peg$c38 = { type: "literal", value: "\\", description: "\"\\\\\"" }, - peg$c39 = /^[\\"]/, - peg$c40 = { type: "class", value: "[\\\\\"]", description: "[\\\\\"]" }, - peg$c41 = function(char) { return char; }, - peg$c42 = /^[^"]/, - peg$c43 = { type: "class", value: "[^\"]", description: "[^\"]" }, - peg$c44 = function(chars) { + peg$c42 = "\\", + peg$c43 = { type: "literal", value: "\\", description: "\"\\\\\"" }, + peg$c44 = /^[\\"]/, + peg$c45 = { type: "class", value: "[\\\\\"]", description: "[\\\\\"]" }, + peg$c46 = function(char) { return char; }, + peg$c47 = /^[^"]/, + peg$c48 = { type: "class", value: "[^\"]", description: "[^\"]" }, + peg$c49 = function(chars) { const sequence = chars.join('').trim(); if (sequence === 'null') return buildLiteralNode(null); if (sequence === 'true') return buildLiteralNode(true); @@ -206,108 +226,104 @@ module.exports = (function() { const value = isNaN(number) ? sequence : number; return buildLiteralNode(value); }, - peg$c45 = { type: "any", description: "any character" }, - peg$c46 = "*", - peg$c47 = { type: "literal", value: "*", description: "\"*\"" }, - peg$c48 = function() { return wildcardSymbol; }, - peg$c49 = "\\t", - peg$c50 = { type: "literal", value: "\\t", description: "\"\\\\t\"" }, - peg$c51 = function() { return '\t'; }, - peg$c52 = "\\r", - peg$c53 = { type: "literal", value: "\\r", description: "\"\\\\r\"" }, - peg$c54 = function() { return '\r'; }, - peg$c55 = "\\n", - peg$c56 = { type: "literal", value: "\\n", description: "\"\\\\n\"" }, - peg$c57 = function() { return '\n'; }, - peg$c58 = function(keyword) { return keyword; }, - peg$c59 = /^[\\():<>"*]/, - peg$c60 = { type: "class", value: "[\\\\():<>\"*]", description: "[\\\\():<>\"*]" }, - peg$c61 = "<=", - peg$c62 = { type: "literal", value: "<=", description: "\"<=\"" }, - peg$c63 = function() { return 'lte'; }, - peg$c64 = ">=", - peg$c65 = { type: "literal", value: ">=", description: "\">=\"" }, - peg$c66 = function() { return 'gte'; }, - peg$c67 = "<", - peg$c68 = { type: "literal", value: "<", description: "\"<\"" }, - peg$c69 = function() { return 'lt'; }, - peg$c70 = ">", - peg$c71 = { type: "literal", value: ">", description: "\">\"" }, - peg$c72 = function() { return 'gt'; }, - peg$c73 = { type: "other", description: "whitespace" }, - peg$c74 = /^[ \t\r\n]/, - peg$c75 = { type: "class", value: "[\\ \\t\\r\\n]", description: "[\\ \\t\\r\\n]" }, - peg$c76 = function() { return parseCursor; }, - peg$c77 = "@kuery-cursor@", - peg$c78 = { type: "literal", value: "@kuery-cursor@", description: "\"@kuery-cursor@\"" }, - peg$c79 = function() { return cursorSymbol; }, - peg$c80 = "||", - peg$c81 = { type: "literal", value: "||", description: "\"||\"" }, - peg$c82 = function() { + peg$c50 = { type: "any", description: "any character" }, + peg$c51 = "*", + peg$c52 = { type: "literal", value: "*", description: "\"*\"" }, + peg$c53 = function() { return wildcardSymbol; }, + peg$c54 = "\\t", + peg$c55 = { type: "literal", value: "\\t", description: "\"\\\\t\"" }, + peg$c56 = function() { return '\t'; }, + peg$c57 = "\\r", + peg$c58 = { type: "literal", value: "\\r", description: "\"\\\\r\"" }, + peg$c59 = function() { return '\r'; }, + peg$c60 = "\\n", + peg$c61 = { type: "literal", value: "\\n", description: "\"\\\\n\"" }, + peg$c62 = function() { return '\n'; }, + peg$c63 = function(keyword) { return keyword; }, + peg$c64 = /^[\\():<>"*{}]/, + peg$c65 = { type: "class", value: "[\\\\():<>\"*{}]", description: "[\\\\():<>\"*{}]" }, + peg$c66 = "<=", + peg$c67 = { type: "literal", value: "<=", description: "\"<=\"" }, + peg$c68 = function() { return 'lte'; }, + peg$c69 = ">=", + peg$c70 = { type: "literal", value: ">=", description: "\">=\"" }, + peg$c71 = function() { return 'gte'; }, + peg$c72 = "<", + peg$c73 = { type: "literal", value: "<", description: "\"<\"" }, + peg$c74 = function() { return 'lt'; }, + peg$c75 = ">", + peg$c76 = { type: "literal", value: ">", description: "\">\"" }, + peg$c77 = function() { return 'gt'; }, + peg$c78 = { type: "other", description: "whitespace" }, + peg$c79 = /^[ \t\r\n]/, + peg$c80 = { type: "class", value: "[\\ \\t\\r\\n]", description: "[\\ \\t\\r\\n]" }, + peg$c81 = function() { return parseCursor; }, + peg$c82 = "@kuery-cursor@", + peg$c83 = { type: "literal", value: "@kuery-cursor@", description: "\"@kuery-cursor@\"" }, + peg$c84 = function() { return cursorSymbol; }, + peg$c85 = "||", + peg$c86 = { type: "literal", value: "||", description: "\"||\"" }, + peg$c87 = function() { error('LuceneOr'); }, - peg$c83 = "&&", - peg$c84 = { type: "literal", value: "&&", description: "\"&&\"" }, - peg$c85 = function() { + peg$c88 = "&&", + peg$c89 = { type: "literal", value: "&&", description: "\"&&\"" }, + peg$c90 = function() { error('LuceneAnd'); }, - peg$c86 = "+", - peg$c87 = { type: "literal", value: "+", description: "\"+\"" }, - peg$c88 = "-", - peg$c89 = { type: "literal", value: "-", description: "\"-\"" }, - peg$c90 = function() { + peg$c91 = "+", + peg$c92 = { type: "literal", value: "+", description: "\"+\"" }, + peg$c93 = "-", + peg$c94 = { type: "literal", value: "-", description: "\"-\"" }, + peg$c95 = function() { error('LuceneNot'); }, - peg$c91 = "!", - peg$c92 = { type: "literal", value: "!", description: "\"!\"" }, - peg$c93 = "_exists_", - peg$c94 = { type: "literal", value: "_exists_", description: "\"_exists_\"" }, - peg$c95 = function() { + peg$c96 = "!", + peg$c97 = { type: "literal", value: "!", description: "\"!\"" }, + peg$c98 = "_exists_", + peg$c99 = { type: "literal", value: "_exists_", description: "\"_exists_\"" }, + peg$c100 = function() { error('LuceneExists'); }, - peg$c96 = function() { + peg$c101 = function() { error('LuceneRange'); }, - peg$c97 = "?", - peg$c98 = { type: "literal", value: "?", description: "\"?\"" }, - peg$c99 = function() { + peg$c102 = "?", + peg$c103 = { type: "literal", value: "?", description: "\"?\"" }, + peg$c104 = function() { error('LuceneWildcard'); }, - peg$c100 = "/", - peg$c101 = { type: "literal", value: "/", description: "\"/\"" }, - peg$c102 = /^[^\/]/, - peg$c103 = { type: "class", value: "[^/]", description: "[^/]" }, - peg$c104 = function() { + peg$c105 = "/", + peg$c106 = { type: "literal", value: "/", description: "\"/\"" }, + peg$c107 = /^[^\/]/, + peg$c108 = { type: "class", value: "[^/]", description: "[^/]" }, + peg$c109 = function() { error('LuceneRegex'); }, - peg$c105 = "~", - peg$c106 = { type: "literal", value: "~", description: "\"~\"" }, - peg$c107 = /^[0-9]/, - peg$c108 = { type: "class", value: "[0-9]", description: "[0-9]" }, - peg$c109 = function() { + peg$c110 = "~", + peg$c111 = { type: "literal", value: "~", description: "\"~\"" }, + peg$c112 = /^[0-9]/, + peg$c113 = { type: "class", value: "[0-9]", description: "[0-9]" }, + peg$c114 = function() { error('LuceneFuzzy'); }, - peg$c110 = function() { + peg$c115 = function() { error('LuceneProximity'); }, - peg$c111 = "^", - peg$c112 = { type: "literal", value: "^", description: "\"^\"" }, - peg$c113 = function() { + peg$c116 = "^", + peg$c117 = { type: "literal", value: "^", description: "\"^\"" }, + peg$c118 = function() { error('LuceneBoost'); }, - peg$c114 = function() { return char; }, - peg$c115 = "=", - peg$c116 = { type: "literal", value: "=", description: "\"=\"" }, - peg$c117 = "{", - peg$c118 = { type: "literal", value: "{", description: "\"{\"" }, - peg$c119 = "}", - peg$c120 = { type: "literal", value: "}", description: "\"}\"" }, - peg$c121 = "[", - peg$c122 = { type: "literal", value: "[", description: "\"[\"" }, - peg$c123 = "]", - peg$c124 = { type: "literal", value: "]", description: "\"]\"" }, - peg$c125 = "TO", - peg$c126 = { type: "literal", value: "TO", description: "\"TO\"" }, + peg$c119 = function() { return char; }, + peg$c120 = "=", + peg$c121 = { type: "literal", value: "=", description: "\"=\"" }, + peg$c122 = "[", + peg$c123 = { type: "literal", value: "[", description: "\"[\"" }, + peg$c124 = "]", + peg$c125 = { type: "literal", value: "]", description: "\"]\"" }, + peg$c126 = "TO", + peg$c127 = { type: "literal", value: "TO", description: "\"TO\"" }, peg$currPos = 0, peg$savedPos = 0, @@ -698,6 +714,107 @@ module.exports = (function() { peg$currPos = s0; s0 = peg$FAILED; } + if (s0 === peg$FAILED) { + s0 = peg$parseNestedQuery(); + } + + return s0; + } + + function peg$parseNestedQuery() { + var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; + + s0 = peg$currPos; + s1 = peg$parseField(); + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$parseSpace(); + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$parseSpace(); + } + if (s2 !== peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 58) { + s3 = peg$c10; + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c11); } + } + if (s3 !== peg$FAILED) { + s4 = []; + s5 = peg$parseSpace(); + while (s5 !== peg$FAILED) { + s4.push(s5); + s5 = peg$parseSpace(); + } + if (s4 !== peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 123) { + s5 = peg$c12; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c13); } + } + if (s5 !== peg$FAILED) { + s6 = []; + s7 = peg$parseSpace(); + while (s7 !== peg$FAILED) { + s6.push(s7); + s7 = peg$parseSpace(); + } + if (s6 !== peg$FAILED) { + s7 = peg$parseOrQuery(); + if (s7 !== peg$FAILED) { + s8 = peg$parseOptionalSpace(); + if (s8 !== peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 125) { + s9 = peg$c14; + peg$currPos++; + } else { + s9 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c15); } + } + if (s9 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c16(s1, s7, s8); + s0 = s1; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } if (s0 === peg$FAILED) { s0 = peg$parseExpression(); } @@ -727,7 +844,7 @@ module.exports = (function() { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c10); } + if (peg$silentFails === 0) { peg$fail(peg$c17); } } return s0; @@ -758,7 +875,7 @@ module.exports = (function() { s5 = peg$parseLiteral(); if (s5 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c11(s1, s3, s5); + s1 = peg$c18(s1, s3, s5); s0 = s1; } else { peg$currPos = s0; @@ -798,11 +915,11 @@ module.exports = (function() { } if (s2 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 58) { - s3 = peg$c12; + s3 = peg$c10; peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c13); } + if (peg$silentFails === 0) { peg$fail(peg$c11); } } if (s3 !== peg$FAILED) { s4 = []; @@ -815,7 +932,7 @@ module.exports = (function() { s5 = peg$parseListOfValues(); if (s5 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c14(s1, s5); + s1 = peg$c19(s1, s5); s0 = s1; } else { peg$currPos = s0; @@ -848,7 +965,7 @@ module.exports = (function() { s1 = peg$parseValue(); if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c15(s1); + s1 = peg$c20(s1); } s0 = s1; @@ -887,7 +1004,7 @@ module.exports = (function() { } if (s5 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c16(s3, s4); + s1 = peg$c21(s3, s4); s0 = s1; } else { peg$currPos = s0; @@ -927,7 +1044,7 @@ module.exports = (function() { s3 = peg$parseOrListOfValues(); if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c17(s1, s3); + s1 = peg$c22(s1, s3); s0 = s1; } else { peg$currPos = s0; @@ -959,7 +1076,7 @@ module.exports = (function() { s3 = peg$parseAndListOfValues(); if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c18(s1, s3); + s1 = peg$c23(s1, s3); s0 = s1; } else { peg$currPos = s0; @@ -989,7 +1106,7 @@ module.exports = (function() { s2 = peg$parseListOfValues(); if (s2 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c19(s2); + s1 = peg$c24(s2); s0 = s1; } else { peg$currPos = s0; @@ -1014,7 +1131,7 @@ module.exports = (function() { s1 = peg$parseQuotedString(); if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c21(s1); + s1 = peg$c26(s1); } s0 = s1; if (s0 === peg$FAILED) { @@ -1022,14 +1139,14 @@ module.exports = (function() { s1 = peg$parseUnquotedLiteral(); if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c22(s1); + s1 = peg$c27(s1); } s0 = s1; } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c20); } + if (peg$silentFails === 0) { peg$fail(peg$c25); } } return s0; @@ -1051,12 +1168,12 @@ module.exports = (function() { s1 = peg$FAILED; } if (s1 !== peg$FAILED) { - if (input.substr(peg$currPos, 2).toLowerCase() === peg$c24) { + if (input.substr(peg$currPos, 2).toLowerCase() === peg$c29) { s2 = input.substr(peg$currPos, 2); peg$currPos += 2; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c25); } + if (peg$silentFails === 0) { peg$fail(peg$c30); } } if (s2 !== peg$FAILED) { s3 = []; @@ -1110,7 +1227,7 @@ module.exports = (function() { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c23); } + if (peg$silentFails === 0) { peg$fail(peg$c28); } } return s0; @@ -1132,12 +1249,12 @@ module.exports = (function() { s1 = peg$FAILED; } if (s1 !== peg$FAILED) { - if (input.substr(peg$currPos, 3).toLowerCase() === peg$c27) { + if (input.substr(peg$currPos, 3).toLowerCase() === peg$c32) { s2 = input.substr(peg$currPos, 3); peg$currPos += 3; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c28); } + if (peg$silentFails === 0) { peg$fail(peg$c33); } } if (s2 !== peg$FAILED) { s3 = []; @@ -1191,7 +1308,7 @@ module.exports = (function() { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c26); } + if (peg$silentFails === 0) { peg$fail(peg$c31); } } return s0; @@ -1202,12 +1319,12 @@ module.exports = (function() { peg$silentFails++; s0 = peg$currPos; - if (input.substr(peg$currPos, 3).toLowerCase() === peg$c30) { + if (input.substr(peg$currPos, 3).toLowerCase() === peg$c35) { s1 = input.substr(peg$currPos, 3); peg$currPos += 3; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c31); } + if (peg$silentFails === 0) { peg$fail(peg$c36); } } if (s1 !== peg$FAILED) { s2 = []; @@ -1257,7 +1374,7 @@ module.exports = (function() { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c29); } + if (peg$silentFails === 0) { peg$fail(peg$c34); } } return s0; @@ -1274,7 +1391,7 @@ module.exports = (function() { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c32); } + if (peg$silentFails === 0) { peg$fail(peg$c37); } } return s0; @@ -1285,11 +1402,11 @@ module.exports = (function() { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 34) { - s1 = peg$c33; + s1 = peg$c38; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c34); } + if (peg$silentFails === 0) { peg$fail(peg$c39); } } if (s1 !== peg$FAILED) { s2 = []; @@ -1309,15 +1426,15 @@ module.exports = (function() { } if (s4 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s5 = peg$c33; + s5 = peg$c38; peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c34); } + if (peg$silentFails === 0) { peg$fail(peg$c39); } } if (s5 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c35(s2, s3, s4); + s1 = peg$c40(s2, s3, s4); s0 = s1; } else { peg$currPos = s0; @@ -1342,11 +1459,11 @@ module.exports = (function() { if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 34) { - s1 = peg$c33; + s1 = peg$c38; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c34); } + if (peg$silentFails === 0) { peg$fail(peg$c39); } } if (s1 !== peg$FAILED) { s2 = []; @@ -1357,15 +1474,15 @@ module.exports = (function() { } if (s2 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s3 = peg$c33; + s3 = peg$c38; peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c34); } + if (peg$silentFails === 0) { peg$fail(peg$c39); } } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c36(s2); + s1 = peg$c41(s2); s0 = s1; } else { peg$currPos = s0; @@ -1391,23 +1508,23 @@ module.exports = (function() { if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 92) { - s1 = peg$c37; + s1 = peg$c42; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c38); } + if (peg$silentFails === 0) { peg$fail(peg$c43); } } if (s1 !== peg$FAILED) { - if (peg$c39.test(input.charAt(peg$currPos))) { + if (peg$c44.test(input.charAt(peg$currPos))) { s2 = input.charAt(peg$currPos); peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c40); } + if (peg$silentFails === 0) { peg$fail(peg$c45); } } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c41(s2); + s1 = peg$c46(s2); s0 = s1; } else { peg$currPos = s0; @@ -1430,16 +1547,16 @@ module.exports = (function() { s1 = peg$FAILED; } if (s1 !== peg$FAILED) { - if (peg$c42.test(input.charAt(peg$currPos))) { + if (peg$c47.test(input.charAt(peg$currPos))) { s2 = input.charAt(peg$currPos); peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c43); } + if (peg$silentFails === 0) { peg$fail(peg$c48); } } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c41(s2); + s1 = peg$c46(s2); s0 = s1; } else { peg$currPos = s0; @@ -1476,7 +1593,7 @@ module.exports = (function() { } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c35(s1, s2, s3); + s1 = peg$c40(s1, s2, s3); s0 = s1; } else { peg$currPos = s0; @@ -1504,7 +1621,7 @@ module.exports = (function() { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c44(s1); + s1 = peg$c49(s1); } s0 = s1; } @@ -1562,11 +1679,11 @@ module.exports = (function() { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c45); } + if (peg$silentFails === 0) { peg$fail(peg$c50); } } if (s4 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c41(s4); + s1 = peg$c46(s4); s0 = s1; } else { peg$currPos = s0; @@ -1597,15 +1714,15 @@ module.exports = (function() { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 42) { - s1 = peg$c46; + s1 = peg$c51; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c47); } + if (peg$silentFails === 0) { peg$fail(peg$c52); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c48(); + s1 = peg$c53(); } s0 = s1; @@ -1633,7 +1750,7 @@ module.exports = (function() { } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c35(s1, s2, s3); + s1 = peg$c40(s1, s2, s3); s0 = s1; } else { peg$currPos = s0; @@ -1663,44 +1780,44 @@ module.exports = (function() { var s0, s1; s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c49) { - s1 = peg$c49; + if (input.substr(peg$currPos, 2) === peg$c54) { + s1 = peg$c54; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c50); } + if (peg$silentFails === 0) { peg$fail(peg$c55); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c51(); + s1 = peg$c56(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c52) { - s1 = peg$c52; + if (input.substr(peg$currPos, 2) === peg$c57) { + s1 = peg$c57; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c53); } + if (peg$silentFails === 0) { peg$fail(peg$c58); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c54(); + s1 = peg$c59(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c55) { - s1 = peg$c55; + if (input.substr(peg$currPos, 2) === peg$c60) { + s1 = peg$c60; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c56); } + if (peg$silentFails === 0) { peg$fail(peg$c61); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c57(); + s1 = peg$c62(); } s0 = s1; } @@ -1714,17 +1831,17 @@ module.exports = (function() { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 92) { - s1 = peg$c37; + s1 = peg$c42; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c38); } + if (peg$silentFails === 0) { peg$fail(peg$c43); } } if (s1 !== peg$FAILED) { s2 = peg$parseSpecialCharacter(); if (s2 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c41(s2); + s1 = peg$c46(s2); s0 = s1; } else { peg$currPos = s0; @@ -1743,41 +1860,41 @@ module.exports = (function() { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 92) { - s1 = peg$c37; + s1 = peg$c42; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c38); } + if (peg$silentFails === 0) { peg$fail(peg$c43); } } if (s1 !== peg$FAILED) { - if (input.substr(peg$currPos, 2).toLowerCase() === peg$c24) { + if (input.substr(peg$currPos, 2).toLowerCase() === peg$c29) { s2 = input.substr(peg$currPos, 2); peg$currPos += 2; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c25); } + if (peg$silentFails === 0) { peg$fail(peg$c30); } } if (s2 === peg$FAILED) { - if (input.substr(peg$currPos, 3).toLowerCase() === peg$c27) { + if (input.substr(peg$currPos, 3).toLowerCase() === peg$c32) { s2 = input.substr(peg$currPos, 3); peg$currPos += 3; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c28); } + if (peg$silentFails === 0) { peg$fail(peg$c33); } } if (s2 === peg$FAILED) { - if (input.substr(peg$currPos, 3).toLowerCase() === peg$c30) { + if (input.substr(peg$currPos, 3).toLowerCase() === peg$c35) { s2 = input.substr(peg$currPos, 3); peg$currPos += 3; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c31); } + if (peg$silentFails === 0) { peg$fail(peg$c36); } } } } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c58(s2); + s1 = peg$c63(s2); s0 = s1; } else { peg$currPos = s0; @@ -1808,12 +1925,12 @@ module.exports = (function() { function peg$parseSpecialCharacter() { var s0; - if (peg$c59.test(input.charAt(peg$currPos))) { + if (peg$c64.test(input.charAt(peg$currPos))) { s0 = input.charAt(peg$currPos); peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c60); } + if (peg$silentFails === 0) { peg$fail(peg$c65); } } return s0; @@ -1823,58 +1940,58 @@ module.exports = (function() { var s0, s1; s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c61) { - s1 = peg$c61; + if (input.substr(peg$currPos, 2) === peg$c66) { + s1 = peg$c66; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c62); } + if (peg$silentFails === 0) { peg$fail(peg$c67); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c63(); + s1 = peg$c68(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c64) { - s1 = peg$c64; + if (input.substr(peg$currPos, 2) === peg$c69) { + s1 = peg$c69; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c65); } + if (peg$silentFails === 0) { peg$fail(peg$c70); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c66(); + s1 = peg$c71(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 60) { - s1 = peg$c67; + s1 = peg$c72; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c68); } + if (peg$silentFails === 0) { peg$fail(peg$c73); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c69(); + s1 = peg$c74(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 62) { - s1 = peg$c70; + s1 = peg$c75; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c71); } + if (peg$silentFails === 0) { peg$fail(peg$c76); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c72(); + s1 = peg$c77(); } s0 = s1; } @@ -1888,17 +2005,17 @@ module.exports = (function() { var s0, s1; peg$silentFails++; - if (peg$c74.test(input.charAt(peg$currPos))) { + if (peg$c79.test(input.charAt(peg$currPos))) { s0 = input.charAt(peg$currPos); peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c75); } + if (peg$silentFails === 0) { peg$fail(peg$c80); } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c73); } + if (peg$silentFails === 0) { peg$fail(peg$c78); } } return s0; @@ -1909,23 +2026,23 @@ module.exports = (function() { s0 = peg$currPos; peg$savedPos = peg$currPos; - s1 = peg$c76(); + s1 = peg$c81(); if (s1) { s1 = void 0; } else { s1 = peg$FAILED; } if (s1 !== peg$FAILED) { - if (input.substr(peg$currPos, 14) === peg$c77) { - s2 = peg$c77; + if (input.substr(peg$currPos, 14) === peg$c82) { + s2 = peg$c82; peg$currPos += 14; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c78); } + if (peg$silentFails === 0) { peg$fail(peg$c83); } } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c79(); + s1 = peg$c84(); s0 = s1; } else { peg$currPos = s0; @@ -1950,12 +2067,12 @@ module.exports = (function() { s2 = peg$parseSpace(); } if (s1 !== peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c80) { - s2 = peg$c80; + if (input.substr(peg$currPos, 2) === peg$c85) { + s2 = peg$c85; peg$currPos += 2; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c81); } + if (peg$silentFails === 0) { peg$fail(peg$c86); } } if (s2 !== peg$FAILED) { s3 = []; @@ -1966,7 +2083,7 @@ module.exports = (function() { } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c82(); + s1 = peg$c87(); s0 = s1; } else { peg$currPos = s0; @@ -1995,12 +2112,12 @@ module.exports = (function() { s2 = peg$parseSpace(); } if (s1 !== peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c83) { - s2 = peg$c83; + if (input.substr(peg$currPos, 2) === peg$c88) { + s2 = peg$c88; peg$currPos += 2; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c84); } + if (peg$silentFails === 0) { peg$fail(peg$c89); } } if (s2 !== peg$FAILED) { s3 = []; @@ -2011,7 +2128,7 @@ module.exports = (function() { } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c85(); + s1 = peg$c90(); s0 = s1; } else { peg$currPos = s0; @@ -2028,15 +2145,15 @@ module.exports = (function() { if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 43) { - s1 = peg$c86; + s1 = peg$c91; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c87); } + if (peg$silentFails === 0) { peg$fail(peg$c92); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c85(); + s1 = peg$c90(); } s0 = s1; } @@ -2049,29 +2166,29 @@ module.exports = (function() { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 45) { - s1 = peg$c88; + s1 = peg$c93; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c89); } + if (peg$silentFails === 0) { peg$fail(peg$c94); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c90(); + s1 = peg$c95(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 33) { - s1 = peg$c91; + s1 = peg$c96; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c92); } + if (peg$silentFails === 0) { peg$fail(peg$c97); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c90(); + s1 = peg$c95(); } s0 = s1; } @@ -2107,11 +2224,11 @@ module.exports = (function() { } if (s2 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 58) { - s3 = peg$c12; + s3 = peg$c10; peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c13); } + if (peg$silentFails === 0) { peg$fail(peg$c11); } } if (s3 !== peg$FAILED) { s4 = []; @@ -2176,12 +2293,12 @@ module.exports = (function() { var s0, s1, s2, s3, s4, s5; s0 = peg$currPos; - if (input.substr(peg$currPos, 8) === peg$c93) { - s1 = peg$c93; + if (input.substr(peg$currPos, 8) === peg$c98) { + s1 = peg$c98; peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c94); } + if (peg$silentFails === 0) { peg$fail(peg$c99); } } if (s1 !== peg$FAILED) { s2 = []; @@ -2192,11 +2309,11 @@ module.exports = (function() { } if (s2 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 58) { - s3 = peg$c12; + s3 = peg$c10; peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c13); } + if (peg$silentFails === 0) { peg$fail(peg$c11); } } if (s3 !== peg$FAILED) { s4 = []; @@ -2209,7 +2326,7 @@ module.exports = (function() { s5 = peg$parseLuceneLiteral(); if (s5 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c95(); + s1 = peg$c100(); s0 = s1; } else { peg$currPos = s0; @@ -2251,7 +2368,7 @@ module.exports = (function() { s3 = peg$parseLuceneLiteral(); if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c96(); + s1 = peg$c101(); s0 = s1; } else { peg$currPos = s0; @@ -2285,7 +2402,7 @@ module.exports = (function() { s6 = peg$parseLuceneRangeEnd(); if (s6 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c96(); + s1 = peg$c101(); s0 = s1; } else { peg$currPos = s0; @@ -2324,11 +2441,11 @@ module.exports = (function() { s2 = peg$parseLuceneUnquotedCharacter(); if (s2 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 42) { - s2 = peg$c46; + s2 = peg$c51; peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c47); } + if (peg$silentFails === 0) { peg$fail(peg$c52); } } } while (s2 !== peg$FAILED) { @@ -2336,21 +2453,21 @@ module.exports = (function() { s2 = peg$parseLuceneUnquotedCharacter(); if (s2 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 42) { - s2 = peg$c46; + s2 = peg$c51; peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c47); } + if (peg$silentFails === 0) { peg$fail(peg$c52); } } } } if (s1 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 63) { - s2 = peg$c97; + s2 = peg$c102; peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c98); } + if (peg$silentFails === 0) { peg$fail(peg$c103); } } if (s2 !== peg$FAILED) { s3 = []; @@ -2361,7 +2478,7 @@ module.exports = (function() { } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c99(); + s1 = peg$c104(); s0 = s1; } else { peg$currPos = s0; @@ -2384,42 +2501,42 @@ module.exports = (function() { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 47) { - s1 = peg$c100; + s1 = peg$c105; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c101); } + if (peg$silentFails === 0) { peg$fail(peg$c106); } } if (s1 !== peg$FAILED) { s2 = []; - if (peg$c102.test(input.charAt(peg$currPos))) { + if (peg$c107.test(input.charAt(peg$currPos))) { s3 = input.charAt(peg$currPos); peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c103); } + if (peg$silentFails === 0) { peg$fail(peg$c108); } } while (s3 !== peg$FAILED) { s2.push(s3); - if (peg$c102.test(input.charAt(peg$currPos))) { + if (peg$c107.test(input.charAt(peg$currPos))) { s3 = input.charAt(peg$currPos); peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c103); } + if (peg$silentFails === 0) { peg$fail(peg$c108); } } } if (s2 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 47) { - s3 = peg$c100; + s3 = peg$c105; peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c101); } + if (peg$silentFails === 0) { peg$fail(peg$c106); } } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c104(); + s1 = peg$c109(); s0 = s1; } else { peg$currPos = s0; @@ -2444,34 +2561,34 @@ module.exports = (function() { s1 = peg$parseLuceneUnquotedLiteral(); if (s1 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 126) { - s2 = peg$c105; + s2 = peg$c110; peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c106); } + if (peg$silentFails === 0) { peg$fail(peg$c111); } } if (s2 !== peg$FAILED) { s3 = []; - if (peg$c107.test(input.charAt(peg$currPos))) { + if (peg$c112.test(input.charAt(peg$currPos))) { s4 = input.charAt(peg$currPos); peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c108); } + if (peg$silentFails === 0) { peg$fail(peg$c113); } } while (s4 !== peg$FAILED) { s3.push(s4); - if (peg$c107.test(input.charAt(peg$currPos))) { + if (peg$c112.test(input.charAt(peg$currPos))) { s4 = input.charAt(peg$currPos); peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c108); } + if (peg$silentFails === 0) { peg$fail(peg$c113); } } } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c109(); + s1 = peg$c114(); s0 = s1; } else { peg$currPos = s0; @@ -2496,34 +2613,34 @@ module.exports = (function() { s1 = peg$parseQuotedString(); if (s1 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 126) { - s2 = peg$c105; + s2 = peg$c110; peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c106); } + if (peg$silentFails === 0) { peg$fail(peg$c111); } } if (s2 !== peg$FAILED) { s3 = []; - if (peg$c107.test(input.charAt(peg$currPos))) { + if (peg$c112.test(input.charAt(peg$currPos))) { s4 = input.charAt(peg$currPos); peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c108); } + if (peg$silentFails === 0) { peg$fail(peg$c113); } } while (s4 !== peg$FAILED) { s3.push(s4); - if (peg$c107.test(input.charAt(peg$currPos))) { + if (peg$c112.test(input.charAt(peg$currPos))) { s4 = input.charAt(peg$currPos); peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c108); } + if (peg$silentFails === 0) { peg$fail(peg$c113); } } } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c110(); + s1 = peg$c115(); s0 = s1; } else { peg$currPos = s0; @@ -2548,34 +2665,34 @@ module.exports = (function() { s1 = peg$parseLuceneLiteral(); if (s1 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 94) { - s2 = peg$c111; + s2 = peg$c116; peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c112); } + if (peg$silentFails === 0) { peg$fail(peg$c117); } } if (s2 !== peg$FAILED) { s3 = []; - if (peg$c107.test(input.charAt(peg$currPos))) { + if (peg$c112.test(input.charAt(peg$currPos))) { s4 = input.charAt(peg$currPos); peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c108); } + if (peg$silentFails === 0) { peg$fail(peg$c113); } } while (s4 !== peg$FAILED) { s3.push(s4); - if (peg$c107.test(input.charAt(peg$currPos))) { + if (peg$c112.test(input.charAt(peg$currPos))) { s4 = input.charAt(peg$currPos); peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c108); } + if (peg$silentFails === 0) { peg$fail(peg$c113); } } } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c113(); + s1 = peg$c118(); s0 = s1; } else { peg$currPos = s0; @@ -2656,7 +2773,7 @@ module.exports = (function() { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c45); } + if (peg$silentFails === 0) { peg$fail(peg$c50); } } if (s3 !== peg$FAILED) { s1 = [s1, s2, s3]; @@ -2707,17 +2824,17 @@ module.exports = (function() { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 92) { - s1 = peg$c37; + s1 = peg$c42; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c38); } + if (peg$silentFails === 0) { peg$fail(peg$c43); } } if (s1 !== peg$FAILED) { s2 = peg$parseLuceneSpecialCharacter(); if (s2 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c114(); + s1 = peg$c119(); s0 = s1; } else { peg$currPos = s0; @@ -2735,51 +2852,51 @@ module.exports = (function() { var s0; if (input.charCodeAt(peg$currPos) === 43) { - s0 = peg$c86; + s0 = peg$c91; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c87); } + if (peg$silentFails === 0) { peg$fail(peg$c92); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 45) { - s0 = peg$c88; + s0 = peg$c93; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c89); } + if (peg$silentFails === 0) { peg$fail(peg$c94); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 61) { - s0 = peg$c115; + s0 = peg$c120; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c116); } + if (peg$silentFails === 0) { peg$fail(peg$c121); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 62) { - s0 = peg$c70; + s0 = peg$c75; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c71); } + if (peg$silentFails === 0) { peg$fail(peg$c76); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 60) { - s0 = peg$c67; + s0 = peg$c72; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c68); } + if (peg$silentFails === 0) { peg$fail(peg$c73); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 33) { - s0 = peg$c91; + s0 = peg$c96; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c92); } + if (peg$silentFails === 0) { peg$fail(peg$c97); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 40) { @@ -2799,99 +2916,99 @@ module.exports = (function() { } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 123) { - s0 = peg$c117; + s0 = peg$c12; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c118); } + if (peg$silentFails === 0) { peg$fail(peg$c13); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 125) { - s0 = peg$c119; + s0 = peg$c14; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c120); } + if (peg$silentFails === 0) { peg$fail(peg$c15); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 91) { - s0 = peg$c121; + s0 = peg$c122; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c122); } + if (peg$silentFails === 0) { peg$fail(peg$c123); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 93) { - s0 = peg$c123; + s0 = peg$c124; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c124); } + if (peg$silentFails === 0) { peg$fail(peg$c125); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 94) { - s0 = peg$c111; + s0 = peg$c116; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c112); } + if (peg$silentFails === 0) { peg$fail(peg$c117); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s0 = peg$c33; + s0 = peg$c38; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c34); } + if (peg$silentFails === 0) { peg$fail(peg$c39); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 126) { - s0 = peg$c105; + s0 = peg$c110; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c106); } + if (peg$silentFails === 0) { peg$fail(peg$c111); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 42) { - s0 = peg$c46; + s0 = peg$c51; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c47); } + if (peg$silentFails === 0) { peg$fail(peg$c52); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 63) { - s0 = peg$c97; + s0 = peg$c102; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c98); } + if (peg$silentFails === 0) { peg$fail(peg$c103); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 58) { - s0 = peg$c12; + s0 = peg$c10; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c13); } + if (peg$silentFails === 0) { peg$fail(peg$c11); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 92) { - s0 = peg$c37; + s0 = peg$c42; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c38); } + if (peg$silentFails === 0) { peg$fail(peg$c43); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 47) { - s0 = peg$c100; + s0 = peg$c105; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c101); } + if (peg$silentFails === 0) { peg$fail(peg$c106); } } } } @@ -2931,12 +3048,12 @@ module.exports = (function() { s1 = peg$FAILED; } if (s1 !== peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c125) { - s2 = peg$c125; + if (input.substr(peg$currPos, 2) === peg$c126) { + s2 = peg$c126; peg$currPos += 2; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c126); } + if (peg$silentFails === 0) { peg$fail(peg$c127); } } if (s2 !== peg$FAILED) { s3 = []; @@ -2972,19 +3089,19 @@ module.exports = (function() { var s0; if (input.charCodeAt(peg$currPos) === 91) { - s0 = peg$c121; + s0 = peg$c122; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c122); } + if (peg$silentFails === 0) { peg$fail(peg$c123); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 123) { - s0 = peg$c117; + s0 = peg$c12; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c118); } + if (peg$silentFails === 0) { peg$fail(peg$c13); } } } @@ -2995,19 +3112,19 @@ module.exports = (function() { var s0; if (input.charCodeAt(peg$currPos) === 93) { - s0 = peg$c123; + s0 = peg$c124; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c124); } + if (peg$silentFails === 0) { peg$fail(peg$c125); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 125) { - s0 = peg$c119; + s0 = peg$c14; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c120); } + if (peg$silentFails === 0) { peg$fail(peg$c15); } } } diff --git a/packages/kbn-es-query/src/kuery/ast/kuery.peg b/packages/kbn-es-query/src/kuery/ast/kuery.peg index ec8368d2a921d..389b9a82d2c76 100644 --- a/packages/kbn-es-query/src/kuery/ast/kuery.peg +++ b/packages/kbn-es-query/src/kuery/ast/kuery.peg @@ -59,7 +59,26 @@ SubQuery } return query; } - / Expression + / NestedQuery + +NestedQuery + = field:Field Space* ':' Space* '{' Space* query:OrQuery trailing:OptionalSpace '}' { + if (query.type === 'cursor') { + return { + ...query, + nestedPath: query.nestedPath ? `${field.value}.${query.nestedPath}` : field.value, + } + }; + + if (trailing.type === 'cursor') { + return { + ...trailing, + suggestionTypes: ['conjunction'] + }; + } + return buildFunctionNode('nested', [field, query]); + } + / Expression Expression = FieldRangeExpression @@ -272,7 +291,7 @@ Keyword = Or / And / Not SpecialCharacter - = [\\():<>"*] + = [\\():<>"*{}] RangeOperator = '<=' { return 'lte'; } diff --git a/packages/kbn-es-query/src/kuery/errors/index.test.js b/packages/kbn-es-query/src/kuery/errors/index.test.js index 91c90b2cce98b..d8040e464b696 100644 --- a/packages/kbn-es-query/src/kuery/errors/index.test.js +++ b/packages/kbn-es-query/src/kuery/errors/index.test.js @@ -25,7 +25,7 @@ describe('kql syntax errors', () => { it('should throw an error for a field query missing a value', () => { expect(() => { fromKueryExpression('response:'); - }).toThrow('Expected "(", value, whitespace but end of input found.\n' + + }).toThrow('Expected "(", "{", value, whitespace but end of input found.\n' + 'response:\n' + '---------^'); }); @@ -65,7 +65,7 @@ describe('kql syntax errors', () => { it('should throw an error for unbalanced quotes', () => { expect(() => { fromKueryExpression('foo:"ba '); - }).toThrow('Expected "(", value, whitespace but "\"" found.\n' + + }).toThrow('Expected "(", "{", value, whitespace but """ found.\n' + 'foo:"ba \n' + '----^'); }); diff --git a/packages/kbn-es-query/src/kuery/functions/__tests__/exists.js b/packages/kbn-es-query/src/kuery/functions/__tests__/exists.js index 0eaa69a3243e0..ee4cfab94e614 100644 --- a/packages/kbn-es-query/src/kuery/functions/__tests__/exists.js +++ b/packages/kbn-es-query/src/kuery/functions/__tests__/exists.js @@ -72,6 +72,21 @@ describe('kuery functions', function () { expect(exists.toElasticsearchQuery) .withArgs(existsNode, indexPattern).to.throwException(/Exists query does not support scripted fields/); }); + + it('should use a provided nested context to create a full field name', function () { + const expected = { + exists: { field: 'nestedField.response' } + }; + + const existsNode = nodeTypes.function.buildNode('exists', 'response'); + const result = exists.toElasticsearchQuery( + existsNode, + indexPattern, + {}, + { nested: { path: 'nestedField' } } + ); + expect(_.isEqual(expected, result)).to.be(true); + }); }); }); }); diff --git a/packages/kbn-es-query/src/kuery/functions/__tests__/geo_bounding_box.js b/packages/kbn-es-query/src/kuery/functions/__tests__/geo_bounding_box.js index 2f8b784d6f6e8..7afa0fcce1bfe 100644 --- a/packages/kbn-es-query/src/kuery/functions/__tests__/geo_bounding_box.js +++ b/packages/kbn-es-query/src/kuery/functions/__tests__/geo_bounding_box.js @@ -102,6 +102,19 @@ describe('kuery functions', function () { expect(geoBoundingBox.toElasticsearchQuery) .withArgs(node, indexPattern).to.throwException(/Geo bounding box query does not support scripted fields/); }); + + it('should use a provided nested context to create a full field name', function () { + const node = nodeTypes.function.buildNode('geoBoundingBox', 'geo', params); + const result = geoBoundingBox.toElasticsearchQuery( + node, + indexPattern, + {}, + { nested: { path: 'nestedField' } } + ); + expect(result).to.have.property('geo_bounding_box'); + expect(result.geo_bounding_box).to.have.property('nestedField.geo'); + }); + }); }); }); diff --git a/packages/kbn-es-query/src/kuery/functions/__tests__/geo_polygon.js b/packages/kbn-es-query/src/kuery/functions/__tests__/geo_polygon.js index 1c6a2e0e47fde..c1f2fae0bb3e1 100644 --- a/packages/kbn-es-query/src/kuery/functions/__tests__/geo_polygon.js +++ b/packages/kbn-es-query/src/kuery/functions/__tests__/geo_polygon.js @@ -114,6 +114,18 @@ describe('kuery functions', function () { expect(geoPolygon.toElasticsearchQuery) .withArgs(node, indexPattern).to.throwException(/Geo polygon query does not support scripted fields/); }); + + it('should use a provided nested context to create a full field name', function () { + const node = nodeTypes.function.buildNode('geoPolygon', 'geo', points); + const result = geoPolygon.toElasticsearchQuery( + node, + indexPattern, + {}, + { nested: { path: 'nestedField' } } + ); + expect(result).to.have.property('geo_polygon'); + expect(result.geo_polygon).to.have.property('nestedField.geo'); + }); }); }); }); diff --git a/packages/kbn-es-query/src/kuery/functions/__tests__/is.js b/packages/kbn-es-query/src/kuery/functions/__tests__/is.js index 18652c9faccb8..b2f3d7ec16a65 100644 --- a/packages/kbn-es-query/src/kuery/functions/__tests__/is.js +++ b/packages/kbn-es-query/src/kuery/functions/__tests__/is.js @@ -245,6 +245,66 @@ describe('kuery functions', function () { expect(result).to.eql(expected); }); + it('should use a provided nested context to create a full field name', function () { + const expected = { + bool: { + should: [ + { match: { 'nestedField.extension': 'jpg' } }, + ], + minimum_should_match: 1 + } + }; + + const node = nodeTypes.function.buildNode('is', 'extension', 'jpg'); + const result = is.toElasticsearchQuery( + node, + indexPattern, + {}, + { nested: { path: 'nestedField' } } + ); + expect(result).to.eql(expected); + }); + + it('should support wildcard field names', function () { + const expected = { + bool: { + should: [ + { match: { extension: 'jpg' } }, + ], + minimum_should_match: 1 + } + }; + + const node = nodeTypes.function.buildNode('is', 'ext*', 'jpg'); + const result = is.toElasticsearchQuery(node, indexPattern); + expect(result).to.eql(expected); + }); + + it('should automatically add a nested query when a wildcard field name covers a nested field', () => { + const expected = { + bool: { + should: [ + { + nested: { + path: 'nestedField.nestedChild', + query: { + match: { + 'nestedField.nestedChild.doublyNestedChild': 'foo' + } + }, + score_mode: 'none' + } + } + ], + minimum_should_match: 1 + } + }; + + + const node = nodeTypes.function.buildNode('is', '*doublyNested*', 'foo'); + const result = is.toElasticsearchQuery(node, indexPattern); + expect(result).to.eql(expected); + }); }); }); }); diff --git a/packages/kbn-es-query/src/kuery/functions/__tests__/nested.js b/packages/kbn-es-query/src/kuery/functions/__tests__/nested.js new file mode 100644 index 0000000000000..5ba73e485ddf1 --- /dev/null +++ b/packages/kbn-es-query/src/kuery/functions/__tests__/nested.js @@ -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 expect from '@kbn/expect'; +import * as nested from '../nested'; +import { nodeTypes } from '../../node_types'; +import * as ast from '../../ast'; +import indexPatternResponse from '../../../__fixtures__/index_pattern_response.json'; + +let indexPattern; + +const childNode = nodeTypes.function.buildNode('is', 'child', 'foo'); + +describe('kuery functions', function () { + describe('nested', function () { + + beforeEach(() => { + indexPattern = indexPatternResponse; + }); + + describe('buildNodeParams', function () { + + it('arguments should contain the unmodified child nodes', function () { + const result = nested.buildNodeParams('nestedField', childNode); + const { arguments: [ resultPath, resultChildNode ] } = result; + expect(ast.toElasticsearchQuery(resultPath)).to.be('nestedField'); + expect(resultChildNode).to.be(childNode); + }); + }); + + describe('toElasticsearchQuery', function () { + + it('should wrap subqueries in an ES nested query', function () { + const node = nodeTypes.function.buildNode('nested', 'nestedField', childNode); + const result = nested.toElasticsearchQuery(node, indexPattern); + expect(result).to.only.have.keys('nested'); + expect(result.nested.path).to.be('nestedField'); + expect(result.nested.score_mode).to.be('none'); + }); + + it('should pass the nested path to subqueries so the full field name can be used', function () { + const node = nodeTypes.function.buildNode('nested', 'nestedField', childNode); + const result = nested.toElasticsearchQuery(node, indexPattern); + const expectedSubQuery = ast.toElasticsearchQuery( + nodeTypes.function.buildNode('is', 'nestedField.child', 'foo') + ); + expect(result.nested.query).to.eql(expectedSubQuery); + }); + + }); + }); +}); diff --git a/packages/kbn-es-query/src/kuery/functions/__tests__/range.js b/packages/kbn-es-query/src/kuery/functions/__tests__/range.js index 4f290206c8bfb..2361e8bb66769 100644 --- a/packages/kbn-es-query/src/kuery/functions/__tests__/range.js +++ b/packages/kbn-es-query/src/kuery/functions/__tests__/range.js @@ -181,6 +181,60 @@ describe('kuery functions', function () { expect(result).to.eql(expected); }); + it('should use a provided nested context to create a full field name', function () { + const expected = { + bool: { + should: [ + { + range: { + 'nestedField.bytes': { + gt: 1000, + lt: 8000 + } + } + } + ], + minimum_should_match: 1 + } + }; + + const node = nodeTypes.function.buildNode('range', 'bytes', { gt: 1000, lt: 8000 }); + const result = range.toElasticsearchQuery( + node, + indexPattern, + {}, + { nested: { path: 'nestedField' } } + ); + expect(result).to.eql(expected); + }); + + it('should automatically add a nested query when a wildcard field name covers a nested field', function () { + const expected = { + bool: { + should: [ + { + nested: { + path: 'nestedField.nestedChild', + query: { + range: { + 'nestedField.nestedChild.doublyNestedChild': { + gt: 1000, + lt: 8000 + } + } + }, + score_mode: 'none' + } + } + ], + minimum_should_match: 1 + } + }; + + const node = nodeTypes.function.buildNode('range', '*doublyNested*', { gt: 1000, lt: 8000 }); + const result = range.toElasticsearchQuery(node, indexPattern); + expect(result).to.eql(expected); + }); }); }); }); diff --git a/packages/kbn-es-query/src/kuery/functions/__tests__/utils/get_full_field_name_node.js b/packages/kbn-es-query/src/kuery/functions/__tests__/utils/get_full_field_name_node.js new file mode 100644 index 0000000000000..dae15979a161c --- /dev/null +++ b/packages/kbn-es-query/src/kuery/functions/__tests__/utils/get_full_field_name_node.js @@ -0,0 +1,88 @@ +/* + * 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 '@kbn/expect'; +import { nodeTypes } from '../../../node_types'; +import indexPatternResponse from '../../../../__fixtures__/index_pattern_response.json'; +import { getFullFieldNameNode } from '../../utils/get_full_field_name_node'; + +let indexPattern; + +describe('getFullFieldNameNode', function () { + + beforeEach(() => { + indexPattern = indexPatternResponse; + }); + + it('should return unchanged name node if no nested path is passed in', () => { + const nameNode = nodeTypes.literal.buildNode('notNested'); + const result = getFullFieldNameNode(nameNode, indexPattern); + expect(result).to.eql(nameNode); + }); + + it('should add the nested path if it is valid according to the index pattern', () => { + const nameNode = nodeTypes.literal.buildNode('child'); + const result = getFullFieldNameNode(nameNode, indexPattern, 'nestedField'); + expect(result).to.eql(nodeTypes.literal.buildNode('nestedField.child')); + }); + + it('should throw an error if a path is provided for a non-nested field', () => { + const nameNode = nodeTypes.literal.buildNode('os'); + expect(getFullFieldNameNode) + .withArgs(nameNode, indexPattern, 'machine') + .to + .throwException(/machine.os is not a nested field but is in nested group "machine" in the KQL expression/); + }); + + it('should throw an error if a nested field is not passed with a path', () => { + const nameNode = nodeTypes.literal.buildNode('nestedField.child'); + expect(getFullFieldNameNode) + .withArgs(nameNode, indexPattern) + .to + .throwException(/nestedField.child is a nested field, but is not in a nested group in the KQL expression./); + }); + + it('should throw an error if a nested field is passed with the wrong path', () => { + const nameNode = nodeTypes.literal.buildNode('nestedChild.doublyNestedChild'); + expect(getFullFieldNameNode) + .withArgs(nameNode, indexPattern, 'nestedField') + .to + // eslint-disable-next-line max-len + .throwException(/Nested field nestedField.nestedChild.doublyNestedChild is being queried with the incorrect nested path. The correct path is nestedField.nestedChild/); + }); + + it('should skip error checking for wildcard names', () => { + const nameNode = nodeTypes.wildcard.buildNode('nested*'); + const result = getFullFieldNameNode(nameNode, indexPattern); + expect(result).to.eql(nameNode); + }); + + it('should skip error checking if no index pattern is passed in', () => { + const nameNode = nodeTypes.literal.buildNode('os'); + expect(getFullFieldNameNode) + .withArgs(nameNode, null, 'machine') + .to + .not + .throwException(); + + const result = getFullFieldNameNode(nameNode, null, 'machine'); + expect(result).to.eql(nodeTypes.literal.buildNode('machine.os')); + }); + +}); diff --git a/packages/kbn-es-query/src/kuery/functions/and.js b/packages/kbn-es-query/src/kuery/functions/and.js index 68e125ea4de59..2650e83814b66 100644 --- a/packages/kbn-es-query/src/kuery/functions/and.js +++ b/packages/kbn-es-query/src/kuery/functions/and.js @@ -25,13 +25,13 @@ export function buildNodeParams(children) { }; } -export function toElasticsearchQuery(node, indexPattern, config) { +export function toElasticsearchQuery(node, indexPattern, config, context) { const children = node.arguments || []; return { bool: { filter: children.map((child) => { - return ast.toElasticsearchQuery(child, indexPattern, config); + return ast.toElasticsearchQuery(child, indexPattern, config, context); }) } }; diff --git a/packages/kbn-es-query/src/kuery/functions/exists.js b/packages/kbn-es-query/src/kuery/functions/exists.js index 64810fc2ba796..29940c8c2a425 100644 --- a/packages/kbn-es-query/src/kuery/functions/exists.js +++ b/packages/kbn-es-query/src/kuery/functions/exists.js @@ -26,9 +26,10 @@ export function buildNodeParams(fieldName) { }; } -export function toElasticsearchQuery(node, indexPattern) { +export function toElasticsearchQuery(node, indexPattern = null, config, context = {}) { const { arguments: [ fieldNameArg ] } = node; - const fieldName = literal.toElasticsearchQuery(fieldNameArg); + const fullFieldNameArg = { ...fieldNameArg, value: context.nested ? `${context.nested.path}.${fieldNameArg.value}` : fieldNameArg.value }; + const fieldName = literal.toElasticsearchQuery(fullFieldNameArg); const field = get(indexPattern, 'fields', []).find(field => field.name === fieldName); if (field && field.scripted) { diff --git a/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.js b/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.js index eeab146f6f698..fd7e68e52e054 100644 --- a/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.js +++ b/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.js @@ -34,9 +34,10 @@ export function buildNodeParams(fieldName, params) { }; } -export function toElasticsearchQuery(node, indexPattern) { +export function toElasticsearchQuery(node, indexPattern, config, context = {}) { const [ fieldNameArg, ...args ] = node.arguments; - const fieldName = nodeTypes.literal.toElasticsearchQuery(fieldNameArg); + const fullFieldNameArg = { ...fieldNameArg, value: context.nested ? `${context.nested.path}.${fieldNameArg.value}` : fieldNameArg.value }; + const fieldName = nodeTypes.literal.toElasticsearchQuery(fullFieldNameArg); const field = _.get(indexPattern, 'fields', []).find(field => field.name === fieldName); const queryParams = args.reduce((acc, arg) => { const snakeArgName = _.snakeCase(arg.name); @@ -57,4 +58,3 @@ export function toElasticsearchQuery(node, indexPattern) { }, }; } - diff --git a/packages/kbn-es-query/src/kuery/functions/geo_polygon.js b/packages/kbn-es-query/src/kuery/functions/geo_polygon.js index 2e9f10071ea32..7756ae731ce6c 100644 --- a/packages/kbn-es-query/src/kuery/functions/geo_polygon.js +++ b/packages/kbn-es-query/src/kuery/functions/geo_polygon.js @@ -33,12 +33,13 @@ export function buildNodeParams(fieldName, points) { }; } -export function toElasticsearchQuery(node, indexPattern) { +export function toElasticsearchQuery(node, indexPattern, config = {}, context = {}) { const [ fieldNameArg, ...points ] = node.arguments; - const fieldName = nodeTypes.literal.toElasticsearchQuery(fieldNameArg); + const fullFieldNameArg = { ...fieldNameArg, value: context.nested ? `${context.nested.path}.${fieldNameArg.value}` : fieldNameArg.value }; + const fieldName = nodeTypes.literal.toElasticsearchQuery(fullFieldNameArg); const field = get(indexPattern, 'fields', []).find(field => field.name === fieldName); const queryParams = { - points: points.map(ast.toElasticsearchQuery) + points: points.map((point) => { return ast.toElasticsearchQuery(point, indexPattern, config, context); }) }; if (field && field.scripted) { diff --git a/packages/kbn-es-query/src/kuery/functions/index.js b/packages/kbn-es-query/src/kuery/functions/index.js index 39b41f5301857..08b30f022f431 100644 --- a/packages/kbn-es-query/src/kuery/functions/index.js +++ b/packages/kbn-es-query/src/kuery/functions/index.js @@ -25,6 +25,7 @@ import * as range from './range'; import * as exists from './exists'; import * as geoBoundingBox from './geo_bounding_box'; import * as geoPolygon from './geo_polygon'; +import * as nested from './nested'; export const functions = { is, @@ -35,4 +36,5 @@ export const functions = { exists, geoBoundingBox, geoPolygon, + nested, }; diff --git a/packages/kbn-es-query/src/kuery/functions/is.js b/packages/kbn-es-query/src/kuery/functions/is.js index 690f98b08ba82..63ade9e8793a7 100644 --- a/packages/kbn-es-query/src/kuery/functions/is.js +++ b/packages/kbn-es-query/src/kuery/functions/is.js @@ -21,9 +21,10 @@ import _ from 'lodash'; import * as ast from '../ast'; import * as literal from '../node_types/literal'; import * as wildcard from '../node_types/wildcard'; -import { getPhraseScript } from '../../filters'; +import { getPhraseScript } from '../../utils/filters'; import { getFields } from './utils/get_fields'; import { getTimeZoneFromSettings } from '../../utils/get_time_zone_from_settings'; +import { getFullFieldNameNode } from './utils/get_full_field_name_node'; export function buildNodeParams(fieldName, value, isPhrase = false) { if (_.isUndefined(fieldName)) { @@ -40,12 +41,13 @@ export function buildNodeParams(fieldName, value, isPhrase = false) { }; } -export function toElasticsearchQuery(node, indexPattern = null, config = {}) { +export function toElasticsearchQuery(node, indexPattern = null, config = {}, context = {}) { const { arguments: [fieldNameArg, valueArg, isPhraseArg] } = node; - const fieldName = ast.toElasticsearchQuery(fieldNameArg); + const fullFieldNameArg = getFullFieldNameNode(fieldNameArg, indexPattern, context.nested ? context.nested.path : undefined); + const fieldName = ast.toElasticsearchQuery(fullFieldNameArg); const value = !_.isUndefined(valueArg) ? ast.toElasticsearchQuery(valueArg) : valueArg; const type = isPhraseArg.value ? 'phrase' : 'best_fields'; - if (fieldNameArg.value === null) { + if (fullFieldNameArg.value === null) { if (valueArg.type === 'wildcard') { return { query_string: { @@ -63,7 +65,7 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) { }; } - const fields = indexPattern ? getFields(fieldNameArg, indexPattern) : []; + const fields = indexPattern ? getFields(fullFieldNameArg, indexPattern) : []; // If no fields are found in the index pattern we send through the given field name as-is. We do this to preserve // the behaviour of lucene on dashboards where there are panels based on different index patterns that have different // fields. If a user queries on a field that exists in one pattern but not the other, the index pattern without the @@ -71,14 +73,14 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) { // keep things familiar for now. if (fields && fields.length === 0) { fields.push({ - name: ast.toElasticsearchQuery(fieldNameArg), + name: ast.toElasticsearchQuery(fullFieldNameArg), scripted: false, }); } const isExistsQuery = valueArg.type === 'wildcard' && value === '*'; const isAllFieldsQuery = - (fieldNameArg.type === 'wildcard' && fieldName === '*') + (fullFieldNameArg.type === 'wildcard' && fieldName === '*') || (fields && indexPattern && fields.length === indexPattern.fields.length); const isMatchAllQuery = isExistsQuery && isAllFieldsQuery; @@ -87,6 +89,27 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) { } const queries = fields.reduce((accumulator, field) => { + const wrapWithNestedQuery = (query) => { + // Wildcards can easily include nested and non-nested fields. There isn't a good way to let + // users handle this themselves so we automatically add nested queries in this scenario. + if ( + !(fullFieldNameArg.type === 'wildcard') + || !_.get(field, 'subType.nested') + || context.nested + ) { + return query; + } + else { + return { + nested: { + path: field.subType.nested.path, + query, + score_mode: 'none' + } + }; + } + }; + if (field.scripted) { // Exists queries don't make sense for scripted fields if (!isExistsQuery) { @@ -98,19 +121,19 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) { } } else if (isExistsQuery) { - return [...accumulator, { + return [...accumulator, wrapWithNestedQuery({ exists: { field: field.name } - }]; + })]; } else if (valueArg.type === 'wildcard') { - return [...accumulator, { + return [...accumulator, wrapWithNestedQuery({ query_string: { fields: [field.name], query: wildcard.toQueryStringQuery(valueArg), } - }]; + })]; } /* If we detect that it's a date field and the user wants an exact date, we need to convert the query to both >= and <= the value provided to force a range query. This is because match and match_phrase queries do not accept a timezone parameter. @@ -118,7 +141,7 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) { */ else if (field.type === 'date') { const timeZoneParam = config.dateFormatTZ ? { time_zone: getTimeZoneFromSettings(config.dateFormatTZ) } : {}; - return [...accumulator, { + return [...accumulator, wrapWithNestedQuery({ range: { [field.name]: { gte: value, @@ -126,15 +149,15 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) { ...timeZoneParam, }, } - }]; + })]; } else { const queryType = type === 'phrase' ? 'match_phrase' : 'match'; - return [...accumulator, { + return [...accumulator, wrapWithNestedQuery({ [queryType]: { [field.name]: value } - }]; + })]; } }, []); @@ -146,4 +169,3 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) { }; } - diff --git a/packages/kbn-es-query/src/kuery/functions/nested.js b/packages/kbn-es-query/src/kuery/functions/nested.js new file mode 100644 index 0000000000000..6237189e16311 --- /dev/null +++ b/packages/kbn-es-query/src/kuery/functions/nested.js @@ -0,0 +1,46 @@ +/* + * 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 ast from '../ast'; +import * as literal from '../node_types/literal'; + +export function buildNodeParams(path, child) { + const pathNode = typeof path === 'string' ? ast.fromLiteralExpression(path) : literal.buildNode(path); + return { + arguments: [pathNode, child], + }; +} + +export function toElasticsearchQuery(node, indexPattern, config, context = {}) { + if (!indexPattern) { + throw new Error('Cannot use nested queries without an index pattern'); + } + + const [path, child] = node.arguments; + const stringPath = ast.toElasticsearchQuery(path); + const fullPath = context.nested && context.nested.path ? `${context.nested.path}.${stringPath}` : stringPath; + + return { + nested: { + path: fullPath, + query: ast.toElasticsearchQuery(child, indexPattern, config, { ...context, nested: { path: fullPath } }), + score_mode: 'none', + }, + }; +} diff --git a/packages/kbn-es-query/src/kuery/functions/not.js b/packages/kbn-es-query/src/kuery/functions/not.js index d3ab14df16bcb..8a4b8c6060109 100644 --- a/packages/kbn-es-query/src/kuery/functions/not.js +++ b/packages/kbn-es-query/src/kuery/functions/not.js @@ -25,13 +25,12 @@ export function buildNodeParams(child) { }; } -export function toElasticsearchQuery(node, indexPattern, config) { +export function toElasticsearchQuery(node, indexPattern, config, context) { const [ argument ] = node.arguments; return { bool: { - must_not: ast.toElasticsearchQuery(argument, indexPattern, config) + must_not: ast.toElasticsearchQuery(argument, indexPattern, config, context) } }; } - diff --git a/packages/kbn-es-query/src/kuery/functions/or.js b/packages/kbn-es-query/src/kuery/functions/or.js index 918d46a6691de..9b27ac9151801 100644 --- a/packages/kbn-es-query/src/kuery/functions/or.js +++ b/packages/kbn-es-query/src/kuery/functions/or.js @@ -25,13 +25,13 @@ export function buildNodeParams(children) { }; } -export function toElasticsearchQuery(node, indexPattern, config) { +export function toElasticsearchQuery(node, indexPattern, config, context) { const children = node.arguments || []; return { bool: { should: children.map((child) => { - return ast.toElasticsearchQuery(child, indexPattern, config); + return ast.toElasticsearchQuery(child, indexPattern, config, context); }), minimum_should_match: 1, }, diff --git a/packages/kbn-es-query/src/kuery/functions/range.js b/packages/kbn-es-query/src/kuery/functions/range.js index df77baf4b0208..f7719998ad524 100644 --- a/packages/kbn-es-query/src/kuery/functions/range.js +++ b/packages/kbn-es-query/src/kuery/functions/range.js @@ -20,9 +20,10 @@ import _ from 'lodash'; import { nodeTypes } from '../node_types'; import * as ast from '../ast'; -import { getRangeScript } from '../../filters'; +import { getRangeScript } from '../../utils/filters'; import { getFields } from './utils/get_fields'; import { getTimeZoneFromSettings } from '../../utils/get_time_zone_from_settings'; +import { getFullFieldNameNode } from './utils/get_full_field_name_node'; export function buildNodeParams(fieldName, params) { params = _.pick(params, 'gt', 'lt', 'gte', 'lte', 'format'); @@ -36,9 +37,10 @@ export function buildNodeParams(fieldName, params) { }; } -export function toElasticsearchQuery(node, indexPattern = null, config = {}) { +export function toElasticsearchQuery(node, indexPattern = null, config = {}, context = {}) { const [ fieldNameArg, ...args ] = node.arguments; - const fields = indexPattern ? getFields(fieldNameArg, indexPattern) : []; + const fullFieldNameArg = getFullFieldNameNode(fieldNameArg, indexPattern, context.nested ? context.nested.path : undefined); + const fields = indexPattern ? getFields(fullFieldNameArg, indexPattern) : []; const namedArgs = extractArguments(args); const queryParams = _.mapValues(namedArgs, ast.toElasticsearchQuery); @@ -49,13 +51,34 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) { // keep things familiar for now. if (fields && fields.length === 0) { fields.push({ - name: ast.toElasticsearchQuery(fieldNameArg), + name: ast.toElasticsearchQuery(fullFieldNameArg), scripted: false, }); } const queries = fields.map((field) => { + const wrapWithNestedQuery = (query) => { + // Wildcards can easily include nested and non-nested fields. There isn't a good way to let + // users handle this themselves so we automatically add nested queries in this scenario. + if ( + !fullFieldNameArg.type === 'wildcard' + || !_.get(field, 'subType.nested') + || context.nested + ) { + return query; + } + else { + return { + nested: { + path: field.subType.nested.path, + query, + score_mode: 'none' + } + }; + } + }; + if (field.scripted) { return { script: getRangeScript(field, queryParams), @@ -63,20 +86,20 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) { } else if (field.type === 'date') { const timeZoneParam = config.dateFormatTZ ? { time_zone: getTimeZoneFromSettings(config.dateFormatTZ) } : {}; - return { + return wrapWithNestedQuery({ range: { [field.name]: { ...queryParams, ...timeZoneParam, } } - }; + }); } - return { + return wrapWithNestedQuery({ range: { [field.name]: queryParams } - }; + }); }); return { diff --git a/packages/kbn-es-query/src/kuery/functions/utils/get_full_field_name_node.js b/packages/kbn-es-query/src/kuery/functions/utils/get_full_field_name_node.js new file mode 100644 index 0000000000000..07540344b7955 --- /dev/null +++ b/packages/kbn-es-query/src/kuery/functions/utils/get_full_field_name_node.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 { getFields } from './get_fields'; + +export function getFullFieldNameNode(rootNameNode, indexPattern, nestedPath) { + const fullFieldNameNode = { + ...rootNameNode, + value: nestedPath ? `${nestedPath}.${rootNameNode.value}` : rootNameNode.value + }; + + // Wildcards can easily include nested and non-nested fields. There isn't a good way to let + // users handle this themselves so we automatically add nested queries in this scenario and skip the + // error checking below. + if (!indexPattern || (fullFieldNameNode.type === 'wildcard' && !nestedPath)) { + return fullFieldNameNode; + } + const fields = getFields(fullFieldNameNode, indexPattern); + + const errors = fields.reduce((acc, field) => { + const nestedPathFromField = field.subType && field.subType.nested ? field.subType.nested.path : undefined; + + if (nestedPath && !nestedPathFromField) { + return [...acc, `${field.name} is not a nested field but is in nested group "${nestedPath}" in the KQL expression.`]; + } + + if (nestedPathFromField && !nestedPath) { + return [...acc, `${field.name} is a nested field, but is not in a nested group in the KQL expression.`]; + } + + if (nestedPathFromField !== nestedPath) { + return [ + ...acc, + `Nested field ${field.name} is being queried with the incorrect nested path. The correct path is ${field.subType.nested.path}.` + ]; + } + + return acc; + }, []); + + if (errors.length > 0) { + throw new Error(errors.join('\n')); + } + + return fullFieldNameNode; +} diff --git a/packages/kbn-es-query/src/kuery/node_types/function.js b/packages/kbn-es-query/src/kuery/node_types/function.js index 6b10bb1f704c8..d54b7de6cd8ea 100644 --- a/packages/kbn-es-query/src/kuery/node_types/function.js +++ b/packages/kbn-es-query/src/kuery/node_types/function.js @@ -47,8 +47,7 @@ export function buildNodeWithArgumentNodes(functionName, argumentNodes) { }; } -export function toElasticsearchQuery(node, indexPattern, config = {}) { +export function toElasticsearchQuery(node, indexPattern, config = {}, context = {}) { const kueryFunction = functions[node.function]; - return kueryFunction.toElasticsearchQuery(node, indexPattern, config); + return kueryFunction.toElasticsearchQuery(node, indexPattern, config, context); } - diff --git a/packages/kbn-es-query/src/kuery/node_types/index.d.ts b/packages/kbn-es-query/src/kuery/node_types/index.d.ts index 0d1f2c28e39f0..daf8032f9fe0e 100644 --- a/packages/kbn-es-query/src/kuery/node_types/index.d.ts +++ b/packages/kbn-es-query/src/kuery/node_types/index.d.ts @@ -31,7 +31,8 @@ type FunctionName = | 'range' | 'exists' | 'geoBoundingBox' - | 'geoPolygon'; + | 'geoPolygon' + | 'nested'; interface FunctionTypeBuildNode { type: 'function'; diff --git a/packages/kbn-es-query/src/utils/filters.js b/packages/kbn-es-query/src/utils/filters.js new file mode 100644 index 0000000000000..6e4f5c342688c --- /dev/null +++ b/packages/kbn-es-query/src/utils/filters.js @@ -0,0 +1,133 @@ +/* + * 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 { pick, get, reduce, map } from 'lodash'; + +/** @deprecated + * @see src/plugins/data/public/es_query/filters/phrase_filter.ts + * Code was already moved into src/plugins/data/public. + * This method will be removed after moving 'es_query' into new platform + * */ +export const getConvertedValueForField = (field, value) => { + if (typeof value !== 'boolean' && field.type === 'boolean') { + if ([1, 'true'].includes(value)) { + return true; + } else if ([0, 'false'].includes(value)) { + return false; + } else { + throw new Error(`${value} is not a valid boolean value for boolean field ${field.name}`); + } + } + return value; +}; + +/** @deprecated + * @see src/plugins/data/public/es_query/filters/phrase_filter.ts + * Code was already moved into src/plugins/data/public. + * This method will be removed after moving 'es_query' into new platform + * */ +export const buildInlineScriptForPhraseFilter = (scriptedField) => { + // We must wrap painless scripts in a lambda in case they're more than a simple expression + if (scriptedField.lang === 'painless') { + return ( + `boolean compare(Supplier s, def v) {return s.get() == v;}` + + `compare(() -> { ${scriptedField.script} }, params.value);` + ); + } else { + return `(${scriptedField.script}) == value`; + } +}; + +/** @deprecated + * @see src/plugins/data/public/es_query/filters/phrase_filter.ts + * Code was already moved into src/plugins/data/public. + * This method will be removed after moving 'es_query' into new platform + * */ +export function getPhraseScript(field, value) { + const convertedValue = getConvertedValueForField(field, value); + const script = buildInlineScriptForPhraseFilter(field); + + return { + script: { + source: script, + lang: field.lang, + params: { + value: convertedValue, + }, + }, + }; +} + +/** @deprecated + * @see src/plugins/data/public/es_query/filters/range_filter.ts + * Code was already moved into src/plugins/data/public. + * This method will be removed after moving 'kuery' into new platform + * */ +export function getRangeScript(field, params) { + const operators = { + gt: '>', + gte: '>=', + lte: '<=', + lt: '<', + }; + const comparators = { + gt: 'boolean gt(Supplier s, def v) {return s.get() > v}', + gte: 'boolean gte(Supplier s, def v) {return s.get() >= v}', + lte: 'boolean lte(Supplier s, def v) {return s.get() <= v}', + lt: 'boolean lt(Supplier s, def v) {return s.get() < v}', + }; + + const dateComparators = { + gt: 'boolean gt(Supplier s, def v) {return s.get().toInstant().isAfter(Instant.parse(v))}', + gte: 'boolean gte(Supplier s, def v) {return !s.get().toInstant().isBefore(Instant.parse(v))}', + lte: 'boolean lte(Supplier s, def v) {return !s.get().toInstant().isAfter(Instant.parse(v))}', + lt: 'boolean lt(Supplier s, def v) {return s.get().toInstant().isBefore(Instant.parse(v))}', + }; + + const knownParams = pick(params, (val, key) => { + return key in operators; + }); + let script = map(knownParams, (val, key) => { + return '(' + field.script + ')' + get(operators, key) + key; + }).join(' && '); + + // We must wrap painless scripts in a lambda in case they're more than a simple expression + if (field.lang === 'painless') { + const comp = field.type === 'date' ? dateComparators : comparators; + const currentComparators = reduce( + knownParams, + (acc, val, key) => acc.concat(get(comp, key)), + [] + ).join(' '); + + const comparisons = map(knownParams, (val, key) => { + return `${key}(() -> { ${field.script} }, params.${key})`; + }).join(' && '); + + script = `${currentComparators}${comparisons}`; + } + + return { + script: { + source: script, + params: knownParams, + lang: field.lang, + }, + }; +} diff --git a/packages/kbn-eslint-plugin-eslint/rules/__tests__/files/no_restricted_paths/server/index_patterns/index.js b/packages/kbn-eslint-plugin-eslint/rules/__tests__/files/no_restricted_paths/server/index_patterns/index.js new file mode 100644 index 0000000000000..d15de7d98a9e0 --- /dev/null +++ b/packages/kbn-eslint-plugin-eslint/rules/__tests__/files/no_restricted_paths/server/index_patterns/index.js @@ -0,0 +1 @@ +/* eslint-disable */ diff --git a/packages/kbn-eslint-plugin-eslint/rules/__tests__/no_restricted_paths.js b/packages/kbn-eslint-plugin-eslint/rules/__tests__/no_restricted_paths.js index f393a867d95e0..577be820ccc7b 100644 --- a/packages/kbn-eslint-plugin-eslint/rules/__tests__/no_restricted_paths.js +++ b/packages/kbn-eslint-plugin-eslint/rules/__tests__/no_restricted_paths.js @@ -172,6 +172,27 @@ ruleTester.run('@kbn/eslint/no-restricted-paths', rule, { }, ], }, + + { + // Check if dirs that start with 'index' work correctly. + code: 'import { X } from "./index_patterns"', + filename: path.join(__dirname, './files/no_restricted_paths/server/b.js'), + options: [ + { + basePath: __dirname, + zones: [ + { + target: ['files/no_restricted_paths/(public|server)/**/*'], + from: [ + 'files/no_restricted_paths/server/**/*', + '!files/no_restricted_paths/server/index.{ts,tsx}', + ], + allowSameFolder: true, + }, + ], + }, + ], + }, ], invalid: [ @@ -369,5 +390,34 @@ ruleTester.run('@kbn/eslint/no-restricted-paths', rule, { }, ], }, + + { + // Don't use index*. + // It won't work with dirs that start with 'index'. + code: 'import { X } from "./index_patterns"', + filename: path.join(__dirname, './files/no_restricted_paths/server/b.js'), + options: [ + { + basePath: __dirname, + zones: [ + { + target: ['files/no_restricted_paths/(public|server)/**/*'], + from: [ + 'files/no_restricted_paths/server/**/*', + '!files/no_restricted_paths/server/index*', + ], + allowSameFolder: true, + }, + ], + }, + ], + errors: [ + { + message: 'Unexpected path "./index_patterns" imported in restricted zone.', + line: 1, + column: 19, + }, + ], + }, ], }); diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js index 2a8c22ed29a79..bbe12a93c241f 100644 --- a/packages/kbn-pm/dist/index.js +++ b/packages/kbn-pm/dist/index.js @@ -94,7 +94,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _cli__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "run", function() { return _cli__WEBPACK_IMPORTED_MODULE_0__["run"]; }); -/* harmony import */ var _production__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(483); +/* harmony import */ var _production__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(484); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["buildProductionProjects"]; }); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "prepareExternalProjectDependencies", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["prepareExternalProjectDependencies"]; }); @@ -152,7 +152,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(16); /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__); /* harmony import */ var _commands__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(17); -/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(474); +/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(475); /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(34); /* * Licensed to Elasticsearch B.V. under one or more contributor @@ -33210,7 +33210,7 @@ const WatchCommand = { __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "waitUntilWatchIsReady", function() { return waitUntilWatchIsReady; }); /* harmony import */ var rxjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(275); -/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(374); +/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(377); /* * Licensed to Elasticsearch B.V. under one or more contributor * license agreements. See the NOTICE file distributed with @@ -33285,45 +33285,45 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _internal_Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Observable", function() { return _internal_Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]; }); -/* harmony import */ var _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294); +/* harmony import */ var _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(293); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ConnectableObservable", function() { return _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__["ConnectableObservable"]; }); -/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(299); +/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(298); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "GroupedObservable", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_2__["GroupedObservable"]; }); -/* harmony import */ var _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(291); +/* harmony import */ var _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(290); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_3__["observable"]; }); -/* harmony import */ var _internal_Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(295); +/* harmony import */ var _internal_Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(294); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return _internal_Subject__WEBPACK_IMPORTED_MODULE_4__["Subject"]; }); -/* harmony import */ var _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(300); +/* harmony import */ var _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(299); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "BehaviorSubject", function() { return _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__["BehaviorSubject"]; }); -/* harmony import */ var _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(301); +/* harmony import */ var _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(300); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ReplaySubject", function() { return _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__["ReplaySubject"]; }); -/* harmony import */ var _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(318); +/* harmony import */ var _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(317); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AsyncSubject", function() { return _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__["AsyncSubject"]; }); -/* harmony import */ var _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(319); +/* harmony import */ var _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(318); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asapScheduler", function() { return _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__["asap"]; }); -/* harmony import */ var _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(323); +/* harmony import */ var _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(322); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asyncScheduler", function() { return _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__["async"]; }); -/* harmony import */ var _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(302); +/* harmony import */ var _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(301); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "queueScheduler", function() { return _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__["queue"]; }); -/* harmony import */ var _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(324); +/* harmony import */ var _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(323); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "animationFrameScheduler", function() { return _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__["animationFrame"]; }); -/* harmony import */ var _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(327); +/* harmony import */ var _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(326); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "VirtualTimeScheduler", function() { return _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__["VirtualTimeScheduler"]; }); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "VirtualAction", function() { return _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__["VirtualAction"]; }); -/* harmony import */ var _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(308); +/* harmony import */ var _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(307); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__["Scheduler"]; }); /* harmony import */ var _internal_Subscription__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(284); @@ -33332,58 +33332,60 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _internal_Subscriber__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(278); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subscriber", function() { return _internal_Subscriber__WEBPACK_IMPORTED_MODULE_15__["Subscriber"]; }); -/* harmony import */ var _internal_Notification__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(310); +/* harmony import */ var _internal_Notification__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(309); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["Notification"]; }); -/* harmony import */ var _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(292); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NotificationKind", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["NotificationKind"]; }); + +/* harmony import */ var _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(291); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pipe", function() { return _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__["pipe"]; }); -/* harmony import */ var _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(293); +/* harmony import */ var _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(292); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__["noop"]; }); -/* harmony import */ var _internal_util_identity__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(328); +/* harmony import */ var _internal_util_identity__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(327); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "identity", function() { return _internal_util_identity__WEBPACK_IMPORTED_MODULE_19__["identity"]; }); -/* harmony import */ var _internal_util_isObservable__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(329); +/* harmony import */ var _internal_util_isObservable__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(328); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isObservable", function() { return _internal_util_isObservable__WEBPACK_IMPORTED_MODULE_20__["isObservable"]; }); -/* harmony import */ var _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(330); +/* harmony import */ var _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(329); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_21__["ArgumentOutOfRangeError"]; }); -/* harmony import */ var _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(331); +/* harmony import */ var _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(330); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_22__["EmptyError"]; }); -/* harmony import */ var _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(296); +/* harmony import */ var _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(295); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_23__["ObjectUnsubscribedError"]; }); -/* harmony import */ var _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(289); +/* harmony import */ var _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(287); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_24__["UnsubscriptionError"]; }); -/* harmony import */ var _internal_util_TimeoutError__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(332); +/* harmony import */ var _internal_util_TimeoutError__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(331); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return _internal_util_TimeoutError__WEBPACK_IMPORTED_MODULE_25__["TimeoutError"]; }); -/* harmony import */ var _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(333); +/* harmony import */ var _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(332); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bindCallback", function() { return _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_26__["bindCallback"]; }); -/* harmony import */ var _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(335); +/* harmony import */ var _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(334); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bindNodeCallback", function() { return _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_27__["bindNodeCallback"]; }); -/* harmony import */ var _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(336); +/* harmony import */ var _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(335); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_28__["combineLatest"]; }); -/* harmony import */ var _internal_observable_concat__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(347); +/* harmony import */ var _internal_observable_concat__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(346); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_observable_concat__WEBPACK_IMPORTED_MODULE_29__["concat"]; }); /* harmony import */ var _internal_observable_defer__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(357); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defer", function() { return _internal_observable_defer__WEBPACK_IMPORTED_MODULE_30__["defer"]; }); -/* harmony import */ var _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(311); +/* harmony import */ var _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(310); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__["empty"]; }); /* harmony import */ var _internal_observable_forkJoin__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(358); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "forkJoin", function() { return _internal_observable_forkJoin__WEBPACK_IMPORTED_MODULE_32__["forkJoin"]; }); -/* harmony import */ var _internal_observable_from__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(348); +/* harmony import */ var _internal_observable_from__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(350); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "from", function() { return _internal_observable_from__WEBPACK_IMPORTED_MODULE_33__["from"]; }); /* harmony import */ var _internal_observable_fromEvent__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(359); @@ -33407,7 +33409,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _internal_observable_never__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(366); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "never", function() { return _internal_observable_never__WEBPACK_IMPORTED_MODULE_40__["never"]; }); -/* harmony import */ var _internal_observable_of__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(312); +/* harmony import */ var _internal_observable_of__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(311); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "of", function() { return _internal_observable_of__WEBPACK_IMPORTED_MODULE_41__["of"]; }); /* harmony import */ var _internal_observable_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(367); @@ -33416,30 +33418,36 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(368); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_43__["pairs"]; }); -/* harmony import */ var _internal_observable_race__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(369); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_observable_race__WEBPACK_IMPORTED_MODULE_44__["race"]; }); +/* harmony import */ var _internal_observable_partition__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(369); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_observable_partition__WEBPACK_IMPORTED_MODULE_44__["partition"]; }); + +/* harmony import */ var _internal_observable_race__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(372); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_observable_race__WEBPACK_IMPORTED_MODULE_45__["race"]; }); + +/* harmony import */ var _internal_observable_range__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(373); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "range", function() { return _internal_observable_range__WEBPACK_IMPORTED_MODULE_46__["range"]; }); -/* harmony import */ var _internal_observable_range__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(370); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "range", function() { return _internal_observable_range__WEBPACK_IMPORTED_MODULE_45__["range"]; }); +/* harmony import */ var _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(316); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_47__["throwError"]; }); -/* harmony import */ var _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(317); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_46__["throwError"]; }); +/* harmony import */ var _internal_observable_timer__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(374); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return _internal_observable_timer__WEBPACK_IMPORTED_MODULE_48__["timer"]; }); -/* harmony import */ var _internal_observable_timer__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(371); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return _internal_observable_timer__WEBPACK_IMPORTED_MODULE_47__["timer"]; }); +/* harmony import */ var _internal_observable_using__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(375); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "using", function() { return _internal_observable_using__WEBPACK_IMPORTED_MODULE_49__["using"]; }); -/* harmony import */ var _internal_observable_using__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(372); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "using", function() { return _internal_observable_using__WEBPACK_IMPORTED_MODULE_48__["using"]; }); +/* harmony import */ var _internal_observable_zip__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(376); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_observable_zip__WEBPACK_IMPORTED_MODULE_50__["zip"]; }); -/* harmony import */ var _internal_observable_zip__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(373); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_observable_zip__WEBPACK_IMPORTED_MODULE_49__["zip"]; }); +/* harmony import */ var _internal_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(351); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scheduled", function() { return _internal_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_51__["scheduled"]; }); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__["EMPTY"]; }); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return _internal_observable_never__WEBPACK_IMPORTED_MODULE_40__["NEVER"]; }); -/* harmony import */ var _internal_config__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(282); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "config", function() { return _internal_config__WEBPACK_IMPORTED_MODULE_50__["config"]; }); +/* harmony import */ var _internal_config__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(282); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "config", function() { return _internal_config__WEBPACK_IMPORTED_MODULE_52__["config"]; }); /** PURE_IMPORTS_START PURE_IMPORTS_END */ @@ -33492,6 +33500,8 @@ __webpack_require__.r(__webpack_exports__); + + @@ -33505,11 +33515,13 @@ __webpack_require__.r(__webpack_exports__); "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Observable", function() { return Observable; }); -/* harmony import */ var _util_toSubscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(277); -/* harmony import */ var _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(291); -/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(292); -/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(282); -/** PURE_IMPORTS_START _util_toSubscriber,_internal_symbol_observable,_util_pipe,_config PURE_IMPORTS_END */ +/* harmony import */ var _util_canReportError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(277); +/* harmony import */ var _util_toSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(289); +/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(290); +/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(291); +/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(282); +/** PURE_IMPORTS_START _util_canReportError,_util_toSubscriber,_symbol_observable,_util_pipe,_config PURE_IMPORTS_END */ + @@ -33529,16 +33541,16 @@ var Observable = /*@__PURE__*/ (function () { }; Observable.prototype.subscribe = function (observerOrNext, error, complete) { var operator = this.operator; - var sink = Object(_util_toSubscriber__WEBPACK_IMPORTED_MODULE_0__["toSubscriber"])(observerOrNext, error, complete); + var sink = Object(_util_toSubscriber__WEBPACK_IMPORTED_MODULE_1__["toSubscriber"])(observerOrNext, error, complete); if (operator) { - operator.call(sink, this.source); + sink.add(operator.call(sink, this.source)); } else { - sink.add(this.source || (_config__WEBPACK_IMPORTED_MODULE_3__["config"].useDeprecatedSynchronousErrorHandling && !sink.syncErrorThrowable) ? + sink.add(this.source || (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling && !sink.syncErrorThrowable) ? this._subscribe(sink) : this._trySubscribe(sink)); } - if (_config__WEBPACK_IMPORTED_MODULE_3__["config"].useDeprecatedSynchronousErrorHandling) { + if (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling) { if (sink.syncErrorThrowable) { sink.syncErrorThrowable = false; if (sink.syncErrorThrown) { @@ -33553,11 +33565,16 @@ var Observable = /*@__PURE__*/ (function () { return this._subscribe(sink); } catch (err) { - if (_config__WEBPACK_IMPORTED_MODULE_3__["config"].useDeprecatedSynchronousErrorHandling) { + if (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling) { sink.syncErrorThrown = true; sink.syncErrorValue = err; } - sink.error(err); + if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_0__["canReportError"])(sink)) { + sink.error(err); + } + else { + console.warn(err); + } } }; Observable.prototype.forEach = function (next, promiseCtor) { @@ -33582,7 +33599,7 @@ var Observable = /*@__PURE__*/ (function () { var source = this.source; return source && source.subscribe(subscriber); }; - Observable.prototype[_internal_symbol_observable__WEBPACK_IMPORTED_MODULE_1__["observable"]] = function () { + Observable.prototype[_symbol_observable__WEBPACK_IMPORTED_MODULE_2__["observable"]] = function () { return this; }; Observable.prototype.pipe = function () { @@ -33593,7 +33610,7 @@ var Observable = /*@__PURE__*/ (function () { if (operations.length === 0) { return this; } - return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_2__["pipeFromArray"])(operations)(this); + return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipeFromArray"])(operations)(this); }; Observable.prototype.toPromise = function (promiseCtor) { var _this = this; @@ -33611,7 +33628,7 @@ var Observable = /*@__PURE__*/ (function () { function getPromiseCtor(promiseCtor) { if (!promiseCtor) { - promiseCtor = _config__WEBPACK_IMPORTED_MODULE_3__["config"].Promise || Promise; + promiseCtor = _config__WEBPACK_IMPORTED_MODULE_4__["config"].Promise || Promise; } if (!promiseCtor) { throw new Error('no Promise impl found'); @@ -33627,29 +33644,26 @@ function getPromiseCtor(promiseCtor) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toSubscriber", function() { return toSubscriber; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "canReportError", function() { return canReportError; }); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(278); -/* harmony import */ var _symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(290); -/* harmony import */ var _Observer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(281); -/** PURE_IMPORTS_START _Subscriber,_symbol_rxSubscriber,_Observer PURE_IMPORTS_END */ - +/** PURE_IMPORTS_START _Subscriber PURE_IMPORTS_END */ - -function toSubscriber(nextOrObserver, error, complete) { - if (nextOrObserver) { - if (nextOrObserver instanceof _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"]) { - return nextOrObserver; +function canReportError(observer) { + while (observer) { + var _a = observer, closed_1 = _a.closed, destination = _a.destination, isStopped = _a.isStopped; + if (closed_1 || isStopped) { + return false; } - if (nextOrObserver[_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__["rxSubscriber"]]) { - return nextOrObserver[_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__["rxSubscriber"]](); + else if (destination && destination instanceof _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"]) { + observer = destination; + } + else { + observer = null; } } - if (!nextOrObserver && !error && !complete) { - return new _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"](_Observer__WEBPACK_IMPORTED_MODULE_2__["empty"]); - } - return new _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"](nextOrObserver, error, complete); + return true; } -//# sourceMappingURL=toSubscriber.js.map +//# sourceMappingURL=canReportError.js.map /***/ }), @@ -33659,11 +33673,12 @@ function toSubscriber(nextOrObserver, error, complete) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Subscriber", function() { return Subscriber; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SafeSubscriber", function() { return SafeSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(280); /* harmony import */ var _Observer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(281); /* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(284); -/* harmony import */ var _internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(290); +/* harmony import */ var _internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(288); /* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(282); /* harmony import */ var _util_hostReportError__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(283); /** PURE_IMPORTS_START tslib,_util_isFunction,_Observer,_Subscription,_internal_symbol_rxSubscriber,_config,_util_hostReportError PURE_IMPORTS_END */ @@ -33692,11 +33707,10 @@ var Subscriber = /*@__PURE__*/ (function (_super) { break; } if (typeof destinationOrNext === 'object') { - if (isTrustedSubscriber(destinationOrNext)) { - var trustedSubscriber = destinationOrNext[_internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_4__["rxSubscriber"]](); - _this.syncErrorThrowable = trustedSubscriber.syncErrorThrowable; - _this.destination = trustedSubscriber; - trustedSubscriber.add(_this); + if (destinationOrNext instanceof Subscriber) { + _this.syncErrorThrowable = destinationOrNext.syncErrorThrowable; + _this.destination = destinationOrNext; + destinationOrNext.add(_this); } else { _this.syncErrorThrowable = true; @@ -33753,14 +33767,12 @@ var Subscriber = /*@__PURE__*/ (function (_super) { this.unsubscribe(); }; Subscriber.prototype._unsubscribeAndRecycle = function () { - var _a = this, _parent = _a._parent, _parents = _a._parents; - this._parent = null; - this._parents = null; + var _parentOrParents = this._parentOrParents; + this._parentOrParents = null; this.unsubscribe(); this.closed = false; this.isStopped = false; - this._parent = _parent; - this._parents = _parents; + this._parentOrParents = _parentOrParents; return this; }; return Subscriber; @@ -33900,9 +33912,7 @@ var SafeSubscriber = /*@__PURE__*/ (function (_super) { }; return SafeSubscriber; }(Subscriber)); -function isTrustedSubscriber(obj) { - return obj instanceof Subscriber || ('syncErrorThrowable' in obj && obj[_internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_4__["rxSubscriber"]]); -} + //# sourceMappingURL=Subscriber.js.map @@ -34198,7 +34208,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hostReportError", function() { return hostReportError; }); /** PURE_IMPORTS_START PURE_IMPORTS_END */ function hostReportError(err) { - setTimeout(function () { throw err; }); + setTimeout(function () { throw err; }, 0); } //# sourceMappingURL=hostReportError.js.map @@ -34213,12 +34223,8 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(285); /* harmony import */ var _util_isObject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(286); /* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(280); -/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(287); -/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(288); -/* harmony import */ var _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(289); -/** PURE_IMPORTS_START _util_isArray,_util_isObject,_util_isFunction,_util_tryCatch,_util_errorObject,_util_UnsubscriptionError PURE_IMPORTS_END */ - - +/* harmony import */ var _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(287); +/** PURE_IMPORTS_START _util_isArray,_util_isObject,_util_isFunction,_util_UnsubscriptionError PURE_IMPORTS_END */ @@ -34226,94 +34232,112 @@ __webpack_require__.r(__webpack_exports__); var Subscription = /*@__PURE__*/ (function () { function Subscription(unsubscribe) { this.closed = false; - this._parent = null; - this._parents = null; + this._parentOrParents = 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; + var _a = this, _parentOrParents = _a._parentOrParents, _unsubscribe = _a._unsubscribe, _subscriptions = _a._subscriptions; this.closed = true; - this._parent = null; - this._parents = null; + this._parentOrParents = 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 (_parentOrParents instanceof Subscription) { + _parentOrParents.remove(this); + } + else if (_parentOrParents !== null) { + for (var index = 0; index < _parentOrParents.length; ++index) { + var parent_1 = _parentOrParents[index]; + parent_1.remove(this); + } } if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__["isFunction"])(_unsubscribe)) { - var trial = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_3__["tryCatch"])(_unsubscribe).call(this); - if (trial === _util_errorObject__WEBPACK_IMPORTED_MODULE_4__["errorObject"]) { - hasErrors = true; - errors = errors || (_util_errorObject__WEBPACK_IMPORTED_MODULE_4__["errorObject"].e instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_5__["UnsubscriptionError"] ? - flattenUnsubscriptionErrors(_util_errorObject__WEBPACK_IMPORTED_MODULE_4__["errorObject"].e.errors) : [_util_errorObject__WEBPACK_IMPORTED_MODULE_4__["errorObject"].e]); + try { + _unsubscribe.call(this); + } + catch (e) { + errors = e instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__["UnsubscriptionError"] ? flattenUnsubscriptionErrors(e.errors) : [e]; } } if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(_subscriptions)) { - index = -1; - len = _subscriptions.length; + var index = -1; + var len = _subscriptions.length; while (++index < len) { var sub = _subscriptions[index]; if (Object(_util_isObject__WEBPACK_IMPORTED_MODULE_1__["isObject"])(sub)) { - var trial = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_3__["tryCatch"])(sub.unsubscribe).call(sub); - if (trial === _util_errorObject__WEBPACK_IMPORTED_MODULE_4__["errorObject"]) { - hasErrors = true; + try { + sub.unsubscribe(); + } + catch (e) { errors = errors || []; - var err = _util_errorObject__WEBPACK_IMPORTED_MODULE_4__["errorObject"].e; - if (err instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_5__["UnsubscriptionError"]) { - errors = errors.concat(flattenUnsubscriptionErrors(err.errors)); + if (e instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__["UnsubscriptionError"]) { + errors = errors.concat(flattenUnsubscriptionErrors(e.errors)); } else { - errors.push(err); + errors.push(e); } } } } } - if (hasErrors) { - throw new _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_5__["UnsubscriptionError"](errors); + if (errors) { + throw new _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__["UnsubscriptionError"](errors); } }; Subscription.prototype.add = function (teardown) { - if (!teardown || (teardown === Subscription.EMPTY)) { + var subscription = teardown; + if (!teardown) { 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') { + if (subscription === this || subscription.closed || typeof subscription.unsubscribe !== 'function') { return subscription; } else if (this.closed) { subscription.unsubscribe(); return subscription; } - else if (typeof subscription._addParent !== 'function') { + else if (!(subscription instanceof Subscription)) { var tmp = subscription; subscription = new Subscription(); subscription._subscriptions = [tmp]; } break; - default: + default: { throw new Error('unrecognized teardown ' + teardown + ' added to Subscription.'); + } + } + var _parentOrParents = subscription._parentOrParents; + if (_parentOrParents === null) { + subscription._parentOrParents = this; + } + else if (_parentOrParents instanceof Subscription) { + if (_parentOrParents === this) { + return subscription; + } + subscription._parentOrParents = [_parentOrParents, this]; + } + else if (_parentOrParents.indexOf(this) === -1) { + _parentOrParents.push(this); + } + else { + return subscription; + } + var subscriptions = this._subscriptions; + if (subscriptions === null) { + this._subscriptions = [subscription]; + } + else { + subscriptions.push(subscription); } - var subscriptions = this._subscriptions || (this._subscriptions = []); - subscriptions.push(subscription); - subscription._addParent(this); return subscription; }; Subscription.prototype.remove = function (subscription) { @@ -34325,18 +34349,6 @@ var Subscription = /*@__PURE__*/ (function () { } } }; - 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; @@ -34345,7 +34357,7 @@ var Subscription = /*@__PURE__*/ (function () { }()); function flattenUnsubscriptionErrors(errors) { - return errors.reduce(function (errs, err) { return errs.concat((err instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_5__["UnsubscriptionError"]) ? err.errors : err); }, []); + return errors.reduce(function (errs, err) { return errs.concat((err instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__["UnsubscriptionError"]) ? err.errors : err); }, []); } //# sourceMappingURL=Subscription.js.map @@ -34358,7 +34370,7 @@ function flattenUnsubscriptionErrors(errors) { __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isArray", function() { return isArray; }); /** PURE_IMPORTS_START PURE_IMPORTS_END */ -var isArray = Array.isArray || (function (x) { return x && typeof x.length === 'number'; }); +var isArray = /*@__PURE__*/ (function () { return Array.isArray || (function (x) { return x && typeof x.length === 'number'; }); })(); //# sourceMappingURL=isArray.js.map @@ -34371,7 +34383,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isObject", function() { return isObject; }); /** PURE_IMPORTS_START PURE_IMPORTS_END */ function isObject(x) { - return x != null && typeof x === 'object'; + return x !== null && typeof x === 'object'; } //# sourceMappingURL=isObject.js.map @@ -34382,25 +34394,22 @@ function isObject(x) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tryCatch", function() { return tryCatch; }); -/* harmony import */ var _errorObject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(288); -/** PURE_IMPORTS_START _errorObject PURE_IMPORTS_END */ - -var tryCatchTarget; -function tryCatcher() { - try { - return tryCatchTarget.apply(this, arguments); - } - catch (e) { - _errorObject__WEBPACK_IMPORTED_MODULE_0__["errorObject"].e = e; - return _errorObject__WEBPACK_IMPORTED_MODULE_0__["errorObject"]; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return UnsubscriptionError; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var UnsubscriptionErrorImpl = /*@__PURE__*/ (function () { + function UnsubscriptionErrorImpl(errors) { + Error.call(this); + this.message = errors ? + errors.length + " errors occurred during unsubscription:\n" + errors.map(function (err, i) { return i + 1 + ") " + err.toString(); }).join('\n ') : ''; + this.name = 'UnsubscriptionError'; + this.errors = errors; + return this; } -} -function tryCatch(fn) { - tryCatchTarget = fn; - return tryCatcher; -} -//# sourceMappingURL=tryCatch.js.map + UnsubscriptionErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype); + return UnsubscriptionErrorImpl; +})(); +var UnsubscriptionError = UnsubscriptionErrorImpl; +//# sourceMappingURL=UnsubscriptionError.js.map /***/ }), @@ -34409,10 +34418,16 @@ function tryCatch(fn) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "errorObject", function() { return errorObject; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rxSubscriber", function() { return rxSubscriber; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "$$rxSubscriber", function() { return $$rxSubscriber; }); /** PURE_IMPORTS_START PURE_IMPORTS_END */ -var errorObject = { e: {} }; -//# sourceMappingURL=errorObject.js.map +var rxSubscriber = /*@__PURE__*/ (function () { + return typeof Symbol === 'function' + ? /*@__PURE__*/ Symbol('rxSubscriber') + : '@@rxSubscriber_' + /*@__PURE__*/ Math.random(); +})(); +var $$rxSubscriber = rxSubscriber; +//# sourceMappingURL=rxSubscriber.js.map /***/ }), @@ -34421,63 +34436,52 @@ var errorObject = { e: {} }; "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return UnsubscriptionError; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/** PURE_IMPORTS_START tslib PURE_IMPORTS_END */ - -var UnsubscriptionError = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](UnsubscriptionError, _super); - function UnsubscriptionError(errors) { - var _this = _super.call(this, errors ? - errors.length + " errors occurred during unsubscription:\n " + errors.map(function (err, i) { return i + 1 + ") " + err.toString(); }).join('\n ') : '') || this; - _this.errors = errors; - _this.name = 'UnsubscriptionError'; - Object.setPrototypeOf(_this, UnsubscriptionError.prototype); - return _this; - } - return UnsubscriptionError; -}(Error)); - -//# sourceMappingURL=UnsubscriptionError.js.map +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toSubscriber", function() { return toSubscriber; }); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(278); +/* harmony import */ var _symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(288); +/* harmony import */ var _Observer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(281); +/** PURE_IMPORTS_START _Subscriber,_symbol_rxSubscriber,_Observer PURE_IMPORTS_END */ -/***/ }), -/* 290 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rxSubscriber", function() { return rxSubscriber; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "$$rxSubscriber", function() { return $$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 +function toSubscriber(nextOrObserver, error, complete) { + if (nextOrObserver) { + if (nextOrObserver instanceof _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"]) { + return nextOrObserver; + } + if (nextOrObserver[_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__["rxSubscriber"]]) { + return nextOrObserver[_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__["rxSubscriber"]](); + } + } + if (!nextOrObserver && !error && !complete) { + return new _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"](_Observer__WEBPACK_IMPORTED_MODULE_2__["empty"]); + } + return new _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"](nextOrObserver, error, complete); +} +//# sourceMappingURL=toSubscriber.js.map /***/ }), -/* 291 */ +/* 290 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return observable; }); /** PURE_IMPORTS_START PURE_IMPORTS_END */ -var observable = typeof Symbol === 'function' && Symbol.observable || '@@observable'; +var observable = /*@__PURE__*/ (function () { return typeof Symbol === 'function' && Symbol.observable || '@@observable'; })(); //# sourceMappingURL=observable.js.map /***/ }), -/* 292 */ +/* 291 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pipe", function() { return pipe; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pipeFromArray", function() { return pipeFromArray; }); -/* harmony import */ var _noop__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(293); +/* harmony import */ var _noop__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(292); /** PURE_IMPORTS_START _noop PURE_IMPORTS_END */ function pipe() { @@ -34502,7 +34506,7 @@ function pipeFromArray(fns) { /***/ }), -/* 293 */ +/* 292 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -34514,7 +34518,7 @@ function noop() { } /***/ }), -/* 294 */ +/* 293 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -34522,11 +34526,11 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ConnectableObservable", function() { return ConnectableObservable; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "connectableObservableDescriptor", function() { return connectableObservableDescriptor; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(295); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(276); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(278); /* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(284); -/* harmony import */ var _operators_refCount__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(298); +/* harmony import */ var _operators_refCount__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(297); /** PURE_IMPORTS_START tslib,_Subject,_Observable,_Subscriber,_Subscription,_operators_refCount PURE_IMPORTS_END */ @@ -34565,9 +34569,6 @@ var ConnectableObservable = /*@__PURE__*/ (function (_super) { this._connection = null; connection = _Subscription__WEBPACK_IMPORTED_MODULE_4__["Subscription"].EMPTY; } - else { - this._connection = connection; - } } return connection; }; @@ -34577,18 +34578,20 @@ var ConnectableObservable = /*@__PURE__*/ (function (_super) { return ConnectableObservable; }(_Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"])); -var connectableProto = ConnectableObservable.prototype; -var connectableObservableDescriptor = { - operator: { value: null }, - _refCount: { value: 0, writable: true }, - _subject: { value: null, writable: true }, - _connection: { value: null, writable: true }, - _subscribe: { value: connectableProto._subscribe }, - _isComplete: { value: connectableProto._isComplete, writable: true }, - getSubject: { value: connectableProto.getSubject }, - connect: { value: connectableProto.connect }, - refCount: { value: connectableProto.refCount } -}; +var connectableObservableDescriptor = /*@__PURE__*/ (function () { + var connectableProto = ConnectableObservable.prototype; + return { + operator: { value: null }, + _refCount: { value: 0, writable: true }, + _subject: { value: null, writable: true }, + _connection: { value: null, writable: true }, + _subscribe: { value: connectableProto._subscribe }, + _isComplete: { value: connectableProto._isComplete, writable: true }, + getSubject: { value: connectableProto.getSubject }, + connect: { value: connectableProto.connect }, + refCount: { value: connectableProto.refCount } + }; +})(); var ConnectableSubscriber = /*@__PURE__*/ (function (_super) { tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ConnectableSubscriber, _super); function ConnectableSubscriber(destination, connectable) { @@ -34673,7 +34676,7 @@ var RefCountSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 295 */ +/* 294 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -34685,9 +34688,9 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(276); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(278); /* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(284); -/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(296); -/* harmony import */ var _SubjectSubscription__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(297); -/* harmony import */ var _internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(290); +/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(295); +/* harmony import */ var _SubjectSubscription__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(296); +/* harmony import */ var _internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(288); /** PURE_IMPORTS_START tslib,_Observable,_Subscriber,_Subscription,_util_ObjectUnsubscribedError,_SubjectSubscription,_internal_symbol_rxSubscriber PURE_IMPORTS_END */ @@ -34849,31 +34852,29 @@ var AnonymousSubject = /*@__PURE__*/ (function (_super) { /***/ }), -/* 296 */ +/* 295 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return ObjectUnsubscribedError; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/** PURE_IMPORTS_START tslib PURE_IMPORTS_END */ - -var ObjectUnsubscribedError = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ObjectUnsubscribedError, _super); - function ObjectUnsubscribedError() { - var _this = _super.call(this, 'object unsubscribed') || this; - _this.name = 'ObjectUnsubscribedError'; - Object.setPrototypeOf(_this, ObjectUnsubscribedError.prototype); - return _this; +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var ObjectUnsubscribedErrorImpl = /*@__PURE__*/ (function () { + function ObjectUnsubscribedErrorImpl() { + Error.call(this); + this.message = 'object unsubscribed'; + this.name = 'ObjectUnsubscribedError'; + return this; } - return ObjectUnsubscribedError; -}(Error)); - + ObjectUnsubscribedErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype); + return ObjectUnsubscribedErrorImpl; +})(); +var ObjectUnsubscribedError = ObjectUnsubscribedErrorImpl; //# sourceMappingURL=ObjectUnsubscribedError.js.map /***/ }), -/* 297 */ +/* 296 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -34916,7 +34917,7 @@ var SubjectSubscription = /*@__PURE__*/ (function (_super) { /***/ }), -/* 298 */ +/* 297 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -34985,7 +34986,7 @@ var RefCountSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 299 */ +/* 298 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -34996,7 +34997,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); /* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(284); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(276); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(295); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(294); /** PURE_IMPORTS_START tslib,_Subscriber,_Subscription,_Observable,_Subject PURE_IMPORTS_END */ @@ -35182,15 +35183,15 @@ var InnerRefCountSubscription = /*@__PURE__*/ (function (_super) { /***/ }), -/* 300 */ +/* 299 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BehaviorSubject", function() { return BehaviorSubject; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(295); -/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(296); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294); +/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(295); /** PURE_IMPORTS_START tslib,_Subject,_util_ObjectUnsubscribedError PURE_IMPORTS_END */ @@ -35237,19 +35238,19 @@ var BehaviorSubject = /*@__PURE__*/ (function (_super) { /***/ }), -/* 301 */ +/* 300 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ReplaySubject", function() { return ReplaySubject; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(295); -/* harmony import */ var _scheduler_queue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(302); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294); +/* harmony import */ var _scheduler_queue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(301); /* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(284); -/* harmony import */ var _operators_observeOn__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(309); -/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(296); -/* harmony import */ var _SubjectSubscription__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(297); +/* harmony import */ var _operators_observeOn__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(308); +/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(295); +/* harmony import */ var _SubjectSubscription__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(296); /** PURE_IMPORTS_START tslib,_Subject,_scheduler_queue,_Subscription,_operators_observeOn,_util_ObjectUnsubscribedError,_SubjectSubscription PURE_IMPORTS_END */ @@ -35370,14 +35371,14 @@ var ReplayEvent = /*@__PURE__*/ (function () { /***/ }), -/* 302 */ +/* 301 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "queue", function() { return queue; }); -/* harmony import */ var _QueueAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(303); -/* harmony import */ var _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(306); +/* harmony import */ var _QueueAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(302); +/* harmony import */ var _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(305); /** PURE_IMPORTS_START _QueueAction,_QueueScheduler PURE_IMPORTS_END */ @@ -35386,14 +35387,14 @@ var queue = /*@__PURE__*/ new _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__["Queu /***/ }), -/* 303 */ +/* 302 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "QueueAction", function() { return QueueAction; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(304); +/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(303); /** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */ @@ -35438,14 +35439,14 @@ var QueueAction = /*@__PURE__*/ (function (_super) { /***/ }), -/* 304 */ +/* 303 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncAction", function() { return AsyncAction; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _Action__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(305); +/* harmony import */ var _Action__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(304); /** PURE_IMPORTS_START tslib,_Action PURE_IMPORTS_END */ @@ -35489,7 +35490,8 @@ var AsyncAction = /*@__PURE__*/ (function (_super) { if (delay !== null && this.delay === delay && this.pending === false) { return id; } - return clearInterval(id) && undefined || undefined; + clearInterval(id); + return undefined; }; AsyncAction.prototype.execute = function (state, delay) { if (this.closed) { @@ -35543,7 +35545,7 @@ var AsyncAction = /*@__PURE__*/ (function (_super) { /***/ }), -/* 305 */ +/* 304 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -35572,14 +35574,14 @@ var Action = /*@__PURE__*/ (function (_super) { /***/ }), -/* 306 */ +/* 305 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "QueueScheduler", function() { return QueueScheduler; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(307); +/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(306); /** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */ @@ -35595,14 +35597,14 @@ var QueueScheduler = /*@__PURE__*/ (function (_super) { /***/ }), -/* 307 */ +/* 306 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncScheduler", function() { return AsyncScheduler; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _Scheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(308); +/* harmony import */ var _Scheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(307); /** PURE_IMPORTS_START tslib,_Scheduler PURE_IMPORTS_END */ @@ -35664,7 +35666,7 @@ var AsyncScheduler = /*@__PURE__*/ (function (_super) { /***/ }), -/* 308 */ +/* 307 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -35684,7 +35686,7 @@ var Scheduler = /*@__PURE__*/ (function () { } return new this.SchedulerAction(this, work).schedule(state, delay); }; - Scheduler.now = Date.now ? Date.now : function () { return +new Date(); }; + Scheduler.now = function () { return Date.now(); }; return Scheduler; }()); @@ -35692,7 +35694,7 @@ var Scheduler = /*@__PURE__*/ (function () { /***/ }), -/* 309 */ +/* 308 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -35703,7 +35705,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObserveOnMessage", function() { return ObserveOnMessage; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); -/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(310); +/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(309); /** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */ @@ -35747,16 +35749,19 @@ var ObserveOnSubscriber = /*@__PURE__*/ (function (_super) { this.unsubscribe(); }; ObserveOnSubscriber.prototype.scheduleMessage = function (notification) { - this.add(this.scheduler.schedule(ObserveOnSubscriber.dispatch, this.delay, new ObserveOnMessage(notification, this.destination))); + var destination = this.destination; + destination.add(this.scheduler.schedule(ObserveOnSubscriber.dispatch, this.delay, new ObserveOnMessage(notification, this.destination))); }; ObserveOnSubscriber.prototype._next = function (value) { this.scheduleMessage(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createNext(value)); }; ObserveOnSubscriber.prototype._error = function (err) { this.scheduleMessage(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createError(err)); + this.unsubscribe(); }; ObserveOnSubscriber.prototype._complete = function () { this.scheduleMessage(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createComplete()); + this.unsubscribe(); }; return ObserveOnSubscriber; }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); @@ -35773,19 +35778,26 @@ var ObserveOnMessage = /*@__PURE__*/ (function () { /***/ }), -/* 310 */ +/* 309 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NotificationKind", function() { return NotificationKind; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return Notification; }); -/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(311); -/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(312); -/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(317); +/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(310); +/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(311); +/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(316); /** PURE_IMPORTS_START _observable_empty,_observable_of,_observable_throwError PURE_IMPORTS_END */ +var NotificationKind; +/*@__PURE__*/ (function (NotificationKind) { + NotificationKind["NEXT"] = "N"; + NotificationKind["ERROR"] = "E"; + NotificationKind["COMPLETE"] = "C"; +})(NotificationKind || (NotificationKind = {})); var Notification = /*@__PURE__*/ (function () { function Notification(kind, value, error) { this.kind = kind; @@ -35855,14 +35867,13 @@ var Notification = /*@__PURE__*/ (function () { /***/ }), -/* 311 */ +/* 310 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return EMPTY; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return empty; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "emptyScheduled", function() { return emptyScheduled; }); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); /** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ @@ -35877,18 +35888,16 @@ function emptyScheduled(scheduler) { /***/ }), -/* 312 */ +/* 311 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "of", function() { return of; }); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(313); -/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(314); -/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(311); -/* harmony import */ var _scalar__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(316); -/** PURE_IMPORTS_START _util_isScheduler,_fromArray,_empty,_scalar PURE_IMPORTS_END */ - +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(312); +/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(313); +/* harmony import */ var _scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(315); +/** PURE_IMPORTS_START _util_isScheduler,_fromArray,_scheduled_scheduleArray PURE_IMPORTS_END */ @@ -35900,24 +35909,17 @@ function of() { var scheduler = args[args.length - 1]; if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_0__["isScheduler"])(scheduler)) { args.pop(); + return Object(_scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(args, scheduler); } else { - scheduler = undefined; - } - switch (args.length) { - case 0: - return Object(_empty__WEBPACK_IMPORTED_MODULE_2__["empty"])(scheduler); - case 1: - return scheduler ? Object(_fromArray__WEBPACK_IMPORTED_MODULE_1__["fromArray"])(args, scheduler) : Object(_scalar__WEBPACK_IMPORTED_MODULE_3__["scalar"])(args[0]); - default: - return Object(_fromArray__WEBPACK_IMPORTED_MODULE_1__["fromArray"])(args, scheduler); + return Object(_fromArray__WEBPACK_IMPORTED_MODULE_1__["fromArray"])(args); } } //# sourceMappingURL=of.js.map /***/ }), -/* 313 */ +/* 312 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -35931,46 +35933,32 @@ function isScheduler(value) { /***/ }), -/* 314 */ +/* 313 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromArray", function() { return fromArray; }); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284); -/* harmony import */ var _util_subscribeToArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(315); -/** PURE_IMPORTS_START _Observable,_Subscription,_util_subscribeToArray PURE_IMPORTS_END */ +/* harmony import */ var _util_subscribeToArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(314); +/* harmony import */ var _scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(315); +/** PURE_IMPORTS_START _Observable,_util_subscribeToArray,_scheduled_scheduleArray PURE_IMPORTS_END */ function fromArray(input, scheduler) { if (!scheduler) { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeToArray__WEBPACK_IMPORTED_MODULE_2__["subscribeToArray"])(input)); + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeToArray__WEBPACK_IMPORTED_MODULE_1__["subscribeToArray"])(input)); } else { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["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(_scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(input, scheduler); } } //# sourceMappingURL=fromArray.js.map /***/ }), -/* 315 */ +/* 314 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -35982,38 +35970,46 @@ var subscribeToArray = function (array) { for (var i = 0, len = array.length; i < len && !subscriber.closed; i++) { subscriber.next(array[i]); } - if (!subscriber.closed) { - subscriber.complete(); - } + subscriber.complete(); }; }; //# sourceMappingURL=subscribeToArray.js.map /***/ }), -/* 316 */ +/* 315 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scalar", function() { return scalar; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleArray", function() { return scheduleArray; }); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284); +/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */ -function scalar(value) { - var result = new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - subscriber.next(value); - subscriber.complete(); + +function scheduleArray(input, scheduler) { + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["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; }); - result._isScalar = true; - result.value = value; - return result; } -//# sourceMappingURL=scalar.js.map +//# sourceMappingURL=scheduleArray.js.map /***/ }), -/* 317 */ +/* 316 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -36038,14 +36034,14 @@ function dispatch(_a) { /***/ }), -/* 318 */ +/* 317 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncSubject", function() { return AsyncSubject; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(295); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294); /* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(284); /** PURE_IMPORTS_START tslib,_Subject,_Subscription PURE_IMPORTS_END */ @@ -36097,14 +36093,14 @@ var AsyncSubject = /*@__PURE__*/ (function (_super) { /***/ }), -/* 319 */ +/* 318 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "asap", function() { return asap; }); -/* harmony import */ var _AsapAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(320); -/* harmony import */ var _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(322); +/* harmony import */ var _AsapAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(319); +/* harmony import */ var _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(321); /** PURE_IMPORTS_START _AsapAction,_AsapScheduler PURE_IMPORTS_END */ @@ -36113,15 +36109,15 @@ var asap = /*@__PURE__*/ new _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__["AsapSc /***/ }), -/* 320 */ +/* 319 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsapAction", function() { return AsapAction; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _util_Immediate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(321); -/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(304); +/* harmony import */ var _util_Immediate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(320); +/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(303); /** PURE_IMPORTS_START tslib,_util_Immediate,_AsyncAction PURE_IMPORTS_END */ @@ -36164,7 +36160,7 @@ var AsapAction = /*@__PURE__*/ (function (_super) { /***/ }), -/* 321 */ +/* 320 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -36194,14 +36190,14 @@ var Immediate = { /***/ }), -/* 322 */ +/* 321 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsapScheduler", function() { return AsapScheduler; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(307); +/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(306); /** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */ @@ -36238,14 +36234,14 @@ var AsapScheduler = /*@__PURE__*/ (function (_super) { /***/ }), -/* 323 */ +/* 322 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "async", function() { return async; }); -/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(304); -/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(307); +/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(303); +/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(306); /** PURE_IMPORTS_START _AsyncAction,_AsyncScheduler PURE_IMPORTS_END */ @@ -36254,14 +36250,14 @@ var async = /*@__PURE__*/ new _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["Asyn /***/ }), -/* 324 */ +/* 323 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "animationFrame", function() { return animationFrame; }); -/* harmony import */ var _AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(325); -/* harmony import */ var _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(326); +/* harmony import */ var _AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(324); +/* harmony import */ var _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(325); /** PURE_IMPORTS_START _AnimationFrameAction,_AnimationFrameScheduler PURE_IMPORTS_END */ @@ -36270,14 +36266,14 @@ var animationFrame = /*@__PURE__*/ new _AnimationFrameScheduler__WEBPACK_IMPORTE /***/ }), -/* 325 */ +/* 324 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AnimationFrameAction", function() { return AnimationFrameAction; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(304); +/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(303); /** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */ @@ -36319,14 +36315,14 @@ var AnimationFrameAction = /*@__PURE__*/ (function (_super) { /***/ }), -/* 326 */ +/* 325 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AnimationFrameScheduler", function() { return AnimationFrameScheduler; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(307); +/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(306); /** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */ @@ -36363,7 +36359,7 @@ var AnimationFrameScheduler = /*@__PURE__*/ (function (_super) { /***/ }), -/* 327 */ +/* 326 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -36371,8 +36367,8 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VirtualTimeScheduler", function() { return VirtualTimeScheduler; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VirtualAction", function() { return VirtualAction; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(304); -/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(307); +/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(303); +/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(306); /** PURE_IMPORTS_START tslib,_AsyncAction,_AsyncScheduler PURE_IMPORTS_END */ @@ -36395,7 +36391,9 @@ var VirtualTimeScheduler = /*@__PURE__*/ (function (_super) { VirtualTimeScheduler.prototype.flush = function () { var _a = this, actions = _a.actions, maxFrames = _a.maxFrames; var error, action; - while ((action = actions.shift()) && (this.frame = action.delay) <= maxFrames) { + while ((action = actions[0]) && action.delay <= maxFrames) { + actions.shift(); + this.frame = action.delay; if (error = action.execute(action.state, action.delay)) { break; } @@ -36484,7 +36482,7 @@ var VirtualAction = /*@__PURE__*/ (function (_super) { /***/ }), -/* 328 */ +/* 327 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -36498,7 +36496,7 @@ function identity(x) { /***/ }), -/* 329 */ +/* 328 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -36514,90 +36512,86 @@ function isObservable(obj) { /***/ }), -/* 330 */ +/* 329 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return ArgumentOutOfRangeError; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/** PURE_IMPORTS_START tslib PURE_IMPORTS_END */ - -var ArgumentOutOfRangeError = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__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; +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var ArgumentOutOfRangeErrorImpl = /*@__PURE__*/ (function () { + function ArgumentOutOfRangeErrorImpl() { + Error.call(this); + this.message = 'argument out of range'; + this.name = 'ArgumentOutOfRangeError'; + return this; } - return ArgumentOutOfRangeError; -}(Error)); - + ArgumentOutOfRangeErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype); + return ArgumentOutOfRangeErrorImpl; +})(); +var ArgumentOutOfRangeError = ArgumentOutOfRangeErrorImpl; //# sourceMappingURL=ArgumentOutOfRangeError.js.map /***/ }), -/* 331 */ +/* 330 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return EmptyError; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/** PURE_IMPORTS_START tslib PURE_IMPORTS_END */ - -var EmptyError = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__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; +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var EmptyErrorImpl = /*@__PURE__*/ (function () { + function EmptyErrorImpl() { + Error.call(this); + this.message = 'no elements in sequence'; + this.name = 'EmptyError'; + return this; } - return EmptyError; -}(Error)); - + EmptyErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype); + return EmptyErrorImpl; +})(); +var EmptyError = EmptyErrorImpl; //# sourceMappingURL=EmptyError.js.map /***/ }), -/* 332 */ +/* 331 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return TimeoutError; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/** PURE_IMPORTS_START tslib PURE_IMPORTS_END */ - -var TimeoutError = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TimeoutError, _super); - function TimeoutError() { - var _this = _super.call(this, 'Timeout has occurred') || this; - _this.name = 'TimeoutError'; - Object.setPrototypeOf(_this, TimeoutError.prototype); - return _this; +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var TimeoutErrorImpl = /*@__PURE__*/ (function () { + function TimeoutErrorImpl() { + Error.call(this); + this.message = 'Timeout has occurred'; + this.name = 'TimeoutError'; + return this; } - return TimeoutError; -}(Error)); - + TimeoutErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype); + return TimeoutErrorImpl; +})(); +var TimeoutError = TimeoutErrorImpl; //# sourceMappingURL=TimeoutError.js.map /***/ }), -/* 333 */ +/* 332 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bindCallback", function() { return bindCallback; }); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(318); -/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(334); -/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(285); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(313); -/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_isArray,_util_isScheduler PURE_IMPORTS_END */ +/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(317); +/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(333); +/* harmony import */ var _util_canReportError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(277); +/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(285); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(312); +/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isArray,_util_isScheduler PURE_IMPORTS_END */ + @@ -36605,7 +36599,7 @@ __webpack_require__.r(__webpack_exports__); function bindCallback(callbackFunc, resultSelector, scheduler) { if (resultSelector) { - if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_4__["isScheduler"])(resultSelector)) { + if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(resultSelector)) { scheduler = resultSelector; } else { @@ -36614,7 +36608,7 @@ function bindCallback(callbackFunc, resultSelector, scheduler) { for (var _i = 0; _i < arguments.length; _i++) { args[_i] = arguments[_i]; } - return bindCallback(callbackFunc, scheduler).apply(void 0, args).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_3__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); })); + return bindCallback(callbackFunc, scheduler).apply(void 0, args).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_4__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); })); }; } } @@ -36647,7 +36641,12 @@ function bindCallback(callbackFunc, resultSelector, scheduler) { callbackFunc.apply(context, args.concat([handler])); } catch (err) { - subject.error(err); + if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_3__["canReportError"])(subject)) { + subject.error(err); + } + else { + console.warn(err); + } } } return subject.subscribe(subscriber); @@ -36699,7 +36698,7 @@ function dispatchError(state) { /***/ }), -/* 334 */ +/* 333 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -36756,18 +36755,20 @@ var MapSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 335 */ +/* 334 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bindNodeCallback", function() { return bindNodeCallback; }); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(318); -/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(334); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(313); -/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(285); -/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_isScheduler,_util_isArray PURE_IMPORTS_END */ +/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(317); +/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(333); +/* harmony import */ var _util_canReportError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(277); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(312); +/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(285); +/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isScheduler,_util_isArray PURE_IMPORTS_END */ + @@ -36775,7 +36776,7 @@ __webpack_require__.r(__webpack_exports__); function bindNodeCallback(callbackFunc, resultSelector, scheduler) { if (resultSelector) { - if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_3__["isScheduler"])(resultSelector)) { + if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_4__["isScheduler"])(resultSelector)) { scheduler = resultSelector; } else { @@ -36784,7 +36785,7 @@ function bindNodeCallback(callbackFunc, resultSelector, scheduler) { for (var _i = 0; _i < arguments.length; _i++) { args[_i] = arguments[_i]; } - return bindNodeCallback(callbackFunc, scheduler).apply(void 0, args).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_4__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); })); + return bindNodeCallback(callbackFunc, scheduler).apply(void 0, args).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_5__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); })); }; } } @@ -36823,7 +36824,12 @@ function bindNodeCallback(callbackFunc, resultSelector, scheduler) { callbackFunc.apply(context, args.concat([handler])); } catch (err) { - subject.error(err); + if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_3__["canReportError"])(subject)) { + subject.error(err); + } + else { + console.warn(err); + } } } return subject.subscribe(subscriber); @@ -36877,7 +36883,7 @@ function dispatchError(arg) { /***/ }), -/* 336 */ +/* 335 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -36886,11 +36892,11 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CombineLatestOperator", function() { return CombineLatestOperator; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CombineLatestSubscriber", function() { return CombineLatestSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(313); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(312); /* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(285); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(338); -/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(314); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(337); +/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(313); /** PURE_IMPORTS_START tslib,_util_isScheduler,_util_isArray,_OuterSubscriber,_util_subscribeToResult,_fromArray PURE_IMPORTS_END */ @@ -36995,7 +37001,7 @@ var CombineLatestSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 337 */ +/* 336 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -37027,26 +37033,36 @@ var OuterSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 338 */ +/* 337 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToResult", function() { return subscribeToResult; }); -/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(339); -/* harmony import */ var _subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(340); -/** PURE_IMPORTS_START _InnerSubscriber,_subscribeTo PURE_IMPORTS_END */ +/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(338); +/* harmony import */ var _subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(339); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(276); +/** PURE_IMPORTS_START _InnerSubscriber,_subscribeTo,_Observable PURE_IMPORTS_END */ + -function subscribeToResult(outerSubscriber, result, outerValue, outerIndex) { - var destination = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_0__["InnerSubscriber"](outerSubscriber, outerValue, outerIndex); +function subscribeToResult(outerSubscriber, result, outerValue, outerIndex, destination) { + if (destination === void 0) { + destination = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_0__["InnerSubscriber"](outerSubscriber, outerValue, outerIndex); + } + if (destination.closed) { + return undefined; + } + if (result instanceof _Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"]) { + return result.subscribe(destination); + } return Object(_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(result)(destination); } //# sourceMappingURL=subscribeToResult.js.map /***/ }), -/* 339 */ +/* 338 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -37085,24 +37101,22 @@ var InnerSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 340 */ +/* 339 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeTo", function() { return subscribeTo; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/* harmony import */ var _subscribeToArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(315); -/* harmony import */ var _subscribeToPromise__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(341); -/* harmony import */ var _subscribeToIterable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(342); -/* harmony import */ var _subscribeToObservable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(344); -/* harmony import */ var _isArrayLike__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(345); -/* harmony import */ var _isPromise__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(346); -/* harmony import */ var _isObject__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(286); -/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(343); -/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(291); -/** PURE_IMPORTS_START _Observable,_subscribeToArray,_subscribeToPromise,_subscribeToIterable,_subscribeToObservable,_isArrayLike,_isPromise,_isObject,_symbol_iterator,_symbol_observable PURE_IMPORTS_END */ - +/* harmony import */ var _subscribeToArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(314); +/* harmony import */ var _subscribeToPromise__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(340); +/* harmony import */ var _subscribeToIterable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(341); +/* harmony import */ var _subscribeToObservable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(343); +/* harmony import */ var _isArrayLike__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(344); +/* harmony import */ var _isPromise__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(345); +/* harmony import */ var _isObject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(286); +/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(342); +/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(290); +/** PURE_IMPORTS_START _subscribeToArray,_subscribeToPromise,_subscribeToIterable,_subscribeToObservable,_isArrayLike,_isPromise,_isObject,_symbol_iterator,_symbol_observable PURE_IMPORTS_END */ @@ -37113,32 +37127,20 @@ __webpack_require__.r(__webpack_exports__); var subscribeTo = function (result) { - if (result instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]) { - return function (subscriber) { - if (result._isScalar) { - subscriber.next(result.value); - subscriber.complete(); - return undefined; - } - else { - return result.subscribe(subscriber); - } - }; + if (!!result && typeof result[_symbol_observable__WEBPACK_IMPORTED_MODULE_8__["observable"]] === 'function') { + return Object(_subscribeToObservable__WEBPACK_IMPORTED_MODULE_3__["subscribeToObservable"])(result); } - else if (result && typeof result[_symbol_observable__WEBPACK_IMPORTED_MODULE_9__["observable"]] === 'function') { - return Object(_subscribeToObservable__WEBPACK_IMPORTED_MODULE_4__["subscribeToObservable"])(result); + else if (Object(_isArrayLike__WEBPACK_IMPORTED_MODULE_4__["isArrayLike"])(result)) { + return Object(_subscribeToArray__WEBPACK_IMPORTED_MODULE_0__["subscribeToArray"])(result); } - else if (Object(_isArrayLike__WEBPACK_IMPORTED_MODULE_5__["isArrayLike"])(result)) { - return Object(_subscribeToArray__WEBPACK_IMPORTED_MODULE_1__["subscribeToArray"])(result); + else if (Object(_isPromise__WEBPACK_IMPORTED_MODULE_5__["isPromise"])(result)) { + return Object(_subscribeToPromise__WEBPACK_IMPORTED_MODULE_1__["subscribeToPromise"])(result); } - else if (Object(_isPromise__WEBPACK_IMPORTED_MODULE_6__["isPromise"])(result)) { - return Object(_subscribeToPromise__WEBPACK_IMPORTED_MODULE_2__["subscribeToPromise"])(result); - } - else if (result && typeof result[_symbol_iterator__WEBPACK_IMPORTED_MODULE_8__["iterator"]] === 'function') { - return Object(_subscribeToIterable__WEBPACK_IMPORTED_MODULE_3__["subscribeToIterable"])(result); + else if (!!result && typeof result[_symbol_iterator__WEBPACK_IMPORTED_MODULE_7__["iterator"]] === 'function') { + return Object(_subscribeToIterable__WEBPACK_IMPORTED_MODULE_2__["subscribeToIterable"])(result); } else { - var value = Object(_isObject__WEBPACK_IMPORTED_MODULE_7__["isObject"])(result) ? 'an invalid object' : "'" + result + "'"; + var value = Object(_isObject__WEBPACK_IMPORTED_MODULE_6__["isObject"])(result) ? 'an invalid object' : "'" + result + "'"; var msg = "You provided " + value + " where a stream was expected." + ' You can provide an Observable, Promise, Array, or Iterable.'; throw new TypeError(msg); @@ -37148,7 +37150,7 @@ var subscribeTo = function (result) { /***/ }), -/* 341 */ +/* 340 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -37173,13 +37175,13 @@ var subscribeToPromise = function (promise) { /***/ }), -/* 342 */ +/* 341 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToIterable", function() { return subscribeToIterable; }); -/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(343); +/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(342); /** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */ var subscribeToIterable = function (iterable) { @@ -37210,7 +37212,7 @@ var subscribeToIterable = function (iterable) { /***/ }), -/* 343 */ +/* 342 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -37231,13 +37233,13 @@ var $$iterator = iterator; /***/ }), -/* 344 */ +/* 343 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToObservable", function() { return subscribeToObservable; }); -/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(291); +/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(290); /** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */ var subscribeToObservable = function (obj) { @@ -37255,7 +37257,7 @@ var subscribeToObservable = function (obj) { /***/ }), -/* 345 */ +/* 344 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -37267,7 +37269,7 @@ var isArrayLike = (function (x) { return x && typeof x.length === 'number' && ty /***/ }), -/* 346 */ +/* 345 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -37275,25 +37277,21 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isPromise", function() { return isPromise; }); /** PURE_IMPORTS_START PURE_IMPORTS_END */ function isPromise(value) { - return value && typeof value.subscribe !== 'function' && typeof value.then === 'function'; + return !!value && typeof value.subscribe !== 'function' && typeof value.then === 'function'; } //# sourceMappingURL=isPromise.js.map /***/ }), -/* 347 */ +/* 346 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return concat; }); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(313); -/* harmony import */ var _of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(312); -/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(348); -/* harmony import */ var _operators_concatAll__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(354); -/** PURE_IMPORTS_START _util_isScheduler,_of,_from,_operators_concatAll PURE_IMPORTS_END */ - - +/* harmony import */ var _of__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(311); +/* harmony import */ var _operators_concatAll__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(347); +/** PURE_IMPORTS_START _of,_operators_concatAll PURE_IMPORTS_END */ function concat() { @@ -37301,249 +37299,19 @@ function concat() { for (var _i = 0; _i < arguments.length; _i++) { observables[_i] = arguments[_i]; } - if (observables.length === 1 || (observables.length === 2 && Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_0__["isScheduler"])(observables[1]))) { - return Object(_from__WEBPACK_IMPORTED_MODULE_2__["from"])(observables[0]); - } - return Object(_operators_concatAll__WEBPACK_IMPORTED_MODULE_3__["concatAll"])()(_of__WEBPACK_IMPORTED_MODULE_1__["of"].apply(void 0, observables)); + return Object(_operators_concatAll__WEBPACK_IMPORTED_MODULE_1__["concatAll"])()(_of__WEBPACK_IMPORTED_MODULE_0__["of"].apply(void 0, observables)); } //# sourceMappingURL=concat.js.map /***/ }), -/* 348 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "from", function() { return from; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/* harmony import */ var _util_isPromise__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(346); -/* harmony import */ var _util_isArrayLike__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(345); -/* harmony import */ var _util_isInteropObservable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(349); -/* harmony import */ var _util_isIterable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(350); -/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(314); -/* harmony import */ var _fromPromise__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(351); -/* harmony import */ var _fromIterable__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(352); -/* harmony import */ var _fromObservable__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(353); -/* harmony import */ var _util_subscribeTo__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(340); -/** 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 _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]) { - return input; - } - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_9__["subscribeTo"])(input)); - } - if (input != null) { - if (Object(_util_isInteropObservable__WEBPACK_IMPORTED_MODULE_3__["isInteropObservable"])(input)) { - return Object(_fromObservable__WEBPACK_IMPORTED_MODULE_8__["fromObservable"])(input, scheduler); - } - else if (Object(_util_isPromise__WEBPACK_IMPORTED_MODULE_1__["isPromise"])(input)) { - return Object(_fromPromise__WEBPACK_IMPORTED_MODULE_6__["fromPromise"])(input, scheduler); - } - else if (Object(_util_isArrayLike__WEBPACK_IMPORTED_MODULE_2__["isArrayLike"])(input)) { - return Object(_fromArray__WEBPACK_IMPORTED_MODULE_5__["fromArray"])(input, scheduler); - } - else if (Object(_util_isIterable__WEBPACK_IMPORTED_MODULE_4__["isIterable"])(input) || typeof input === 'string') { - return Object(_fromIterable__WEBPACK_IMPORTED_MODULE_7__["fromIterable"])(input, scheduler); - } - } - throw new TypeError((input !== null && typeof input || input) + ' is not observable'); -} -//# sourceMappingURL=from.js.map - - -/***/ }), -/* 349 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isInteropObservable", function() { return isInteropObservable; }); -/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(291); -/** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */ - -function isInteropObservable(input) { - return input && typeof input[_symbol_observable__WEBPACK_IMPORTED_MODULE_0__["observable"]] === 'function'; -} -//# sourceMappingURL=isInteropObservable.js.map - - -/***/ }), -/* 350 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isIterable", function() { return isIterable; }); -/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(343); -/** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */ - -function isIterable(input) { - return input && typeof input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_0__["iterator"]] === 'function'; -} -//# sourceMappingURL=isIterable.js.map - - -/***/ }), -/* 351 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromPromise", function() { return fromPromise; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284); -/* harmony import */ var _util_subscribeToPromise__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(341); -/** PURE_IMPORTS_START _Observable,_Subscription,_util_subscribeToPromise PURE_IMPORTS_END */ - - - -function fromPromise(input, scheduler) { - if (!scheduler) { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeToPromise__WEBPACK_IMPORTED_MODULE_2__["subscribeToPromise"])(input)); - } - else { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); - sub.add(scheduler.schedule(function () { - return input.then(function (value) { - sub.add(scheduler.schedule(function () { - subscriber.next(value); - sub.add(scheduler.schedule(function () { return subscriber.complete(); })); - })); - }, function (err) { - sub.add(scheduler.schedule(function () { return subscriber.error(err); })); - }); - })); - return sub; - }); - } -} -//# sourceMappingURL=fromPromise.js.map - - -/***/ }), -/* 352 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromIterable", function() { return fromIterable; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284); -/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(343); -/* harmony import */ var _util_subscribeToIterable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(342); -/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_iterator,_util_subscribeToIterable PURE_IMPORTS_END */ - - - - -function fromIterable(input, scheduler) { - if (!input) { - throw new Error('Iterable cannot be null'); - } - if (!scheduler) { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeToIterable__WEBPACK_IMPORTED_MODULE_3__["subscribeToIterable"])(input)); - } - else { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); - var iterator; - sub.add(function () { - if (iterator && typeof iterator.return === 'function') { - iterator.return(); - } - }); - sub.add(scheduler.schedule(function () { - iterator = input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_2__["iterator"]](); - sub.add(scheduler.schedule(function () { - if (subscriber.closed) { - return; - } - var value; - var done; - try { - var result = iterator.next(); - value = result.value; - done = result.done; - } - catch (err) { - subscriber.error(err); - return; - } - if (done) { - subscriber.complete(); - } - else { - subscriber.next(value); - this.schedule(); - } - })); - })); - return sub; - }); - } -} -//# sourceMappingURL=fromIterable.js.map - - -/***/ }), -/* 353 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromObservable", function() { return fromObservable; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284); -/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(291); -/* harmony import */ var _util_subscribeToObservable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(344); -/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_observable,_util_subscribeToObservable PURE_IMPORTS_END */ - - - - -function fromObservable(input, scheduler) { - if (!scheduler) { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeToObservable__WEBPACK_IMPORTED_MODULE_3__["subscribeToObservable"])(input)); - } - else { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); - sub.add(scheduler.schedule(function () { - var observable = input[_symbol_observable__WEBPACK_IMPORTED_MODULE_2__["observable"]](); - sub.add(observable.subscribe({ - next: function (value) { sub.add(scheduler.schedule(function () { return subscriber.next(value); })); }, - error: function (err) { sub.add(scheduler.schedule(function () { return subscriber.error(err); })); }, - complete: function () { sub.add(scheduler.schedule(function () { return subscriber.complete(); })); }, - })); - })); - return sub; - }); - } -} -//# sourceMappingURL=fromObservable.js.map - - -/***/ }), -/* 354 */ +/* 347 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return concatAll; }); -/* harmony import */ var _mergeAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(355); +/* harmony import */ var _mergeAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(348); /** PURE_IMPORTS_START _mergeAll PURE_IMPORTS_END */ function concatAll() { @@ -37553,14 +37321,14 @@ function concatAll() { /***/ }), -/* 355 */ +/* 348 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return mergeAll; }); -/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(356); -/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(328); +/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(349); +/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(327); /** PURE_IMPORTS_START _mergeMap,_util_identity PURE_IMPORTS_END */ @@ -37574,7 +37342,7 @@ function mergeAll(concurrent) { /***/ }), -/* 356 */ +/* 349 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -37583,11 +37351,13 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeMapOperator", function() { return MergeMapOperator; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeMapSubscriber", function() { return MergeMapSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(338); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337); -/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(334); -/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(348); -/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_map,_observable_from PURE_IMPORTS_END */ +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(337); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(336); +/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(338); +/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(333); +/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(350); +/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_InnerSubscriber,_map,_observable_from PURE_IMPORTS_END */ + @@ -37598,7 +37368,7 @@ function mergeMap(project, resultSelector, concurrent) { concurrent = Number.POSITIVE_INFINITY; } if (typeof resultSelector === 'function') { - return function (source) { return source.pipe(mergeMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_4__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); }, concurrent)); }; + return function (source) { return source.pipe(mergeMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_5__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_4__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); }, concurrent)); }; } else if (typeof resultSelector === 'number') { concurrent = resultSelector; @@ -37656,13 +37426,17 @@ var MergeMapSubscriber = /*@__PURE__*/ (function (_super) { this._innerSub(result, value, index); }; MergeMapSubscriber.prototype._innerSub = function (ish, value, index) { - this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__["subscribeToResult"])(this, ish, value, index)); + var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__["InnerSubscriber"](this, undefined, undefined); + var destination = this.destination; + destination.add(innerSubscriber); + Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__["subscribeToResult"])(this, ish, value, index, innerSubscriber); }; MergeMapSubscriber.prototype._complete = function () { this.hasCompleted = true; if (this.active === 0 && this.buffer.length === 0) { this.destination.complete(); } + this.unsubscribe(); }; MergeMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { this.destination.next(innerValue); @@ -37684,6 +37458,230 @@ var MergeMapSubscriber = /*@__PURE__*/ (function (_super) { //# sourceMappingURL=mergeMap.js.map +/***/ }), +/* 350 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "from", function() { return from; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); +/* harmony import */ var _util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(339); +/* harmony import */ var _scheduled_scheduled__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(351); +/** PURE_IMPORTS_START _Observable,_util_subscribeTo,_scheduled_scheduled PURE_IMPORTS_END */ + + + +function from(input, scheduler) { + if (!scheduler) { + if (input instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]) { + return input; + } + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(input)); + } + else { + return Object(_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_2__["scheduled"])(input, scheduler); + } +} +//# sourceMappingURL=from.js.map + + +/***/ }), +/* 351 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduled", function() { return scheduled; }); +/* harmony import */ var _scheduleObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(352); +/* harmony import */ var _schedulePromise__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(353); +/* harmony import */ var _scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(315); +/* harmony import */ var _scheduleIterable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(354); +/* harmony import */ var _util_isInteropObservable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(355); +/* harmony import */ var _util_isPromise__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(345); +/* harmony import */ var _util_isArrayLike__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(344); +/* harmony import */ var _util_isIterable__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(356); +/** PURE_IMPORTS_START _scheduleObservable,_schedulePromise,_scheduleArray,_scheduleIterable,_util_isInteropObservable,_util_isPromise,_util_isArrayLike,_util_isIterable PURE_IMPORTS_END */ + + + + + + + + +function scheduled(input, scheduler) { + if (input != null) { + if (Object(_util_isInteropObservable__WEBPACK_IMPORTED_MODULE_4__["isInteropObservable"])(input)) { + return Object(_scheduleObservable__WEBPACK_IMPORTED_MODULE_0__["scheduleObservable"])(input, scheduler); + } + else if (Object(_util_isPromise__WEBPACK_IMPORTED_MODULE_5__["isPromise"])(input)) { + return Object(_schedulePromise__WEBPACK_IMPORTED_MODULE_1__["schedulePromise"])(input, scheduler); + } + else if (Object(_util_isArrayLike__WEBPACK_IMPORTED_MODULE_6__["isArrayLike"])(input)) { + return Object(_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(input, scheduler); + } + else if (Object(_util_isIterable__WEBPACK_IMPORTED_MODULE_7__["isIterable"])(input) || typeof input === 'string') { + return Object(_scheduleIterable__WEBPACK_IMPORTED_MODULE_3__["scheduleIterable"])(input, scheduler); + } + } + throw new TypeError((input !== null && typeof input || input) + ' is not observable'); +} +//# sourceMappingURL=scheduled.js.map + + +/***/ }), +/* 352 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleObservable", function() { return scheduleObservable; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284); +/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(290); +/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_observable PURE_IMPORTS_END */ + + + +function scheduleObservable(input, scheduler) { + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); + sub.add(scheduler.schedule(function () { + var observable = input[_symbol_observable__WEBPACK_IMPORTED_MODULE_2__["observable"]](); + sub.add(observable.subscribe({ + next: function (value) { sub.add(scheduler.schedule(function () { return subscriber.next(value); })); }, + error: function (err) { sub.add(scheduler.schedule(function () { return subscriber.error(err); })); }, + complete: function () { sub.add(scheduler.schedule(function () { return subscriber.complete(); })); }, + })); + })); + return sub; + }); +} +//# sourceMappingURL=scheduleObservable.js.map + + +/***/ }), +/* 353 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "schedulePromise", function() { return schedulePromise; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284); +/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */ + + +function schedulePromise(input, scheduler) { + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); + sub.add(scheduler.schedule(function () { + return input.then(function (value) { + sub.add(scheduler.schedule(function () { + subscriber.next(value); + sub.add(scheduler.schedule(function () { return subscriber.complete(); })); + })); + }, function (err) { + sub.add(scheduler.schedule(function () { return subscriber.error(err); })); + }); + })); + return sub; + }); +} +//# sourceMappingURL=schedulePromise.js.map + + +/***/ }), +/* 354 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleIterable", function() { return scheduleIterable; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284); +/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(342); +/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_iterator PURE_IMPORTS_END */ + + + +function scheduleIterable(input, scheduler) { + if (!input) { + throw new Error('Iterable cannot be null'); + } + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); + var iterator; + sub.add(function () { + if (iterator && typeof iterator.return === 'function') { + iterator.return(); + } + }); + sub.add(scheduler.schedule(function () { + iterator = input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_2__["iterator"]](); + sub.add(scheduler.schedule(function () { + if (subscriber.closed) { + return; + } + var value; + var done; + try { + var result = iterator.next(); + value = result.value; + done = result.done; + } + catch (err) { + subscriber.error(err); + return; + } + if (done) { + subscriber.complete(); + } + else { + subscriber.next(value); + this.schedule(); + } + })); + })); + return sub; + }); +} +//# sourceMappingURL=scheduleIterable.js.map + + +/***/ }), +/* 355 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isInteropObservable", function() { return isInteropObservable; }); +/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(290); +/** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */ + +function isInteropObservable(input) { + return input && typeof input[_symbol_observable__WEBPACK_IMPORTED_MODULE_0__["observable"]] === 'function'; +} +//# sourceMappingURL=isInteropObservable.js.map + + +/***/ }), +/* 356 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isIterable", function() { return isIterable; }); +/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(342); +/** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */ + +function isIterable(input) { + return input && typeof input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_0__["iterator"]] === 'function'; +} +//# sourceMappingURL=isIterable.js.map + + /***/ }), /* 357 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { @@ -37692,8 +37690,8 @@ var MergeMapSubscriber = /*@__PURE__*/ (function (_super) { __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "defer", function() { return defer; }); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(348); -/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(311); +/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(350); +/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(310); /** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */ @@ -37722,16 +37720,12 @@ function defer(observableFactory) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "forkJoin", function() { return forkJoin; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(276); -/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(285); -/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(311); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(338); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(337); -/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(334); -/** PURE_IMPORTS_START tslib,_Observable,_util_isArray,_empty,_util_subscribeToResult,_OuterSubscriber,_operators_map PURE_IMPORTS_END */ - - +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); +/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(285); +/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(333); +/* harmony import */ var _util_isObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(286); +/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(350); +/** PURE_IMPORTS_START _Observable,_util_isArray,_operators_map,_util_isObject,_from PURE_IMPORTS_END */ @@ -37742,66 +37736,63 @@ function forkJoin() { for (var _i = 0; _i < arguments.length; _i++) { sources[_i] = arguments[_i]; } - var resultSelector; - if (typeof sources[sources.length - 1] === 'function') { - resultSelector = sources.pop(); - } - if (sources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(sources[0])) { - sources = sources[0]; - } - if (sources.length === 0) { - return _empty__WEBPACK_IMPORTED_MODULE_3__["EMPTY"]; + if (sources.length === 1) { + var first_1 = sources[0]; + if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(first_1)) { + return forkJoinInternal(first_1, null); + } + if (Object(_util_isObject__WEBPACK_IMPORTED_MODULE_3__["isObject"])(first_1) && Object.getPrototypeOf(first_1) === Object.prototype) { + var keys = Object.keys(first_1); + return forkJoinInternal(keys.map(function (key) { return first_1[key]; }), keys); + } } - if (resultSelector) { - return forkJoin(sources).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_6__["map"])(function (args) { return resultSelector.apply(void 0, args); })); + if (typeof sources[sources.length - 1] === 'function') { + var resultSelector_1 = sources.pop(); + sources = (sources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(sources[0])) ? sources[0] : sources; + return forkJoinInternal(sources, null).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return resultSelector_1.apply(void 0, args); })); } - return new _Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"](function (subscriber) { - return new ForkJoinSubscriber(subscriber, sources); - }); + return forkJoinInternal(sources, null); } -var ForkJoinSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ForkJoinSubscriber, _super); - function ForkJoinSubscriber(destination, sources) { - var _this = _super.call(this, destination) || this; - _this.sources = sources; - _this.completed = 0; - _this.haveValues = 0; +function forkJoinInternal(sources, keys) { + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { var len = sources.length; - _this.values = new Array(len); - for (var i = 0; i < len; i++) { - var source = sources[i]; - var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(_this, source, null, i); - if (innerSubscription) { - _this.add(innerSubscription); - } - } - return _this; - } - ForkJoinSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.values[outerIndex] = innerValue; - if (!innerSub._hasValue) { - innerSub._hasValue = true; - this.haveValues++; - } - }; - ForkJoinSubscriber.prototype.notifyComplete = function (innerSub) { - var _a = this, destination = _a.destination, haveValues = _a.haveValues, values = _a.values; - var len = values.length; - if (!innerSub._hasValue) { - destination.complete(); - return; - } - this.completed++; - if (this.completed !== len) { + if (len === 0) { + subscriber.complete(); return; } - if (haveValues === len) { - destination.next(values); + var values = new Array(len); + var completed = 0; + var emitted = 0; + var _loop_1 = function (i) { + var source = Object(_from__WEBPACK_IMPORTED_MODULE_4__["from"])(sources[i]); + var hasValue = false; + subscriber.add(source.subscribe({ + next: function (value) { + if (!hasValue) { + hasValue = true; + emitted++; + } + values[i] = value; + }, + error: function (err) { return subscriber.error(err); }, + complete: function () { + completed++; + if (completed === len || !hasValue) { + if (emitted === len) { + subscriber.next(keys ? + keys.reduce(function (result, key, i) { return (result[key] = values[i], result); }, {}) : + values); + } + subscriber.complete(); + } + } + })); + }; + for (var i = 0; i < len; i++) { + _loop_1(i); } - destination.complete(); - }; - return ForkJoinSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_5__["OuterSubscriber"])); + }); +} //# sourceMappingURL=forkJoin.js.map @@ -37815,13 +37806,13 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); /* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(285); /* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(280); -/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(334); +/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(333); /** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */ -var toString = Object.prototype.toString; +var toString = /*@__PURE__*/ (function () { return Object.prototype.toString; })(); function fromEvent(target, eventName, options, resultSelector) { if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__["isFunction"])(options)) { resultSelector = options; @@ -37891,7 +37882,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); /* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(285); /* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(280); -/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(334); +/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(333); /** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */ @@ -37934,8 +37925,8 @@ function fromEventPattern(addHandler, removeHandler, resultSelector) { __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "generate", function() { return generate; }); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(328); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(313); +/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(327); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(312); /** PURE_IMPORTS_START _Observable,_util_identity,_util_isScheduler PURE_IMPORTS_END */ @@ -38071,7 +38062,7 @@ function dispatch(state) { __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "iif", function() { return iif; }); /* harmony import */ var _defer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(357); -/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(311); +/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(310); /** PURE_IMPORTS_START _defer,_empty PURE_IMPORTS_END */ @@ -38095,7 +38086,7 @@ function iif(condition, trueResult, falseResult) { __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "interval", function() { return interval; }); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(323); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(322); /* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(364); /** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric PURE_IMPORTS_END */ @@ -38151,9 +38142,9 @@ function isNumeric(val) { __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return merge; }); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(313); -/* harmony import */ var _operators_mergeAll__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(355); -/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(314); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(312); +/* harmony import */ var _operators_mergeAll__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(348); +/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(313); /** PURE_IMPORTS_START _Observable,_util_isScheduler,_operators_mergeAll,_fromArray PURE_IMPORTS_END */ @@ -38193,7 +38184,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return NEVER; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "never", function() { return never; }); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(293); +/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(292); /** PURE_IMPORTS_START _Observable,_util_noop PURE_IMPORTS_END */ @@ -38212,9 +38203,9 @@ function never() { __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return onErrorResumeNext; }); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(348); +/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(350); /* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(285); -/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(311); +/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(310); /** PURE_IMPORTS_START _Observable,_from,_util_isArray,_empty PURE_IMPORTS_END */ @@ -38299,6 +38290,104 @@ function dispatch(state) { /* 369 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return partition; }); +/* harmony import */ var _util_not__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(370); +/* harmony import */ var _util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(339); +/* harmony import */ var _operators_filter__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(371); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(276); +/** PURE_IMPORTS_START _util_not,_util_subscribeTo,_operators_filter,_Observable PURE_IMPORTS_END */ + + + + +function partition(source, predicate, thisArg) { + return [ + Object(_operators_filter__WEBPACK_IMPORTED_MODULE_2__["filter"])(predicate, thisArg)(new _Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"](Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(source))), + Object(_operators_filter__WEBPACK_IMPORTED_MODULE_2__["filter"])(Object(_util_not__WEBPACK_IMPORTED_MODULE_0__["not"])(predicate, thisArg))(new _Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"](Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(source))) + ]; +} +//# sourceMappingURL=partition.js.map + + +/***/ }), +/* 370 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "not", function() { return not; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +function not(pred, thisArg) { + function notPred() { + return !(notPred.pred.apply(notPred.thisArg, arguments)); + } + notPred.pred = pred; + notPred.thisArg = thisArg; + return notPred; +} +//# sourceMappingURL=not.js.map + + +/***/ }), +/* 371 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return filter; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); +/** 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) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__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; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=filter.js.map + + +/***/ }), +/* 372 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "race", function() { return race; }); @@ -38306,9 +38395,9 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RaceSubscriber", function() { return RaceSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(285); -/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(314); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(338); +/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(313); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(337); /** PURE_IMPORTS_START tslib,_util_isArray,_fromArray,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -38390,7 +38479,7 @@ var RaceSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 370 */ +/* 373 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -38404,10 +38493,11 @@ function range(start, count, scheduler) { if (start === void 0) { start = 0; } - if (count === void 0) { - count = 0; - } return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + if (count === undefined) { + count = start; + start = 0; + } var index = 0; var current = start; if (scheduler) { @@ -38448,16 +38538,16 @@ function dispatch(state) { /***/ }), -/* 371 */ +/* 374 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return timer; }); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(323); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(322); /* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(364); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(313); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(312); /** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */ @@ -38502,15 +38592,15 @@ function dispatch(state) { /***/ }), -/* 372 */ +/* 375 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "using", function() { return using; }); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(348); -/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(311); +/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(350); +/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(310); /** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */ @@ -38547,7 +38637,7 @@ function using(resourceFactory, observableFactory) { /***/ }), -/* 373 */ +/* 376 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -38556,12 +38646,12 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ZipOperator", function() { return ZipOperator; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ZipSubscriber", function() { return ZipSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(314); +/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(313); /* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(285); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(278); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(338); -/* harmony import */ var _internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(343); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(337); +/* harmony import */ var _internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(342); /** PURE_IMPORTS_START tslib,_fromArray,_util_isArray,_Subscriber,_OuterSubscriber,_util_subscribeToResult,_.._internal_symbol_iterator PURE_IMPORTS_END */ @@ -38619,6 +38709,7 @@ var ZipSubscriber = /*@__PURE__*/ (function (_super) { ZipSubscriber.prototype._complete = function () { var iterators = this.iterators; var len = iterators.length; + this.unsubscribe(); if (len === 0) { this.destination.complete(); return; @@ -38627,7 +38718,8 @@ var ZipSubscriber = /*@__PURE__*/ (function (_super) { for (var i = 0; i < len; i++) { var iterator = iterators[i]; if (iterator.stillUnsubscribed) { - this.add(iterator.subscribe(iterator, i)); + var destination = this.destination; + destination.add(iterator.subscribe(iterator, i)); } else { this.active--; @@ -38781,173 +38873,173 @@ var ZipBufferIterator = /*@__PURE__*/ (function (_super) { /***/ }), -/* 374 */ +/* 377 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(375); +/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(378); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__["audit"]; }); -/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(376); +/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(379); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__["auditTime"]; }); -/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(377); +/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(380); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__["buffer"]; }); -/* harmony import */ var _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(378); +/* harmony import */ var _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(381); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__["bufferCount"]; }); -/* harmony import */ var _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(379); +/* harmony import */ var _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(382); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__["bufferTime"]; }); -/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(380); +/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(383); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__["bufferToggle"]; }); -/* harmony import */ var _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(381); +/* harmony import */ var _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(384); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__["bufferWhen"]; }); -/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(382); +/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(385); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__["catchError"]; }); -/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(383); +/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(386); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__["combineAll"]; }); -/* harmony import */ var _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(384); +/* harmony import */ var _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(387); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__["combineLatest"]; }); -/* harmony import */ var _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(385); +/* harmony import */ var _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(388); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__["concat"]; }); -/* harmony import */ var _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(354); +/* harmony import */ var _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(347); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_11__["concatAll"]; }); -/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(386); +/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(389); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__["concatMap"]; }); -/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(387); +/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(390); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__["concatMapTo"]; }); -/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(388); +/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(391); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "count", function() { return _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__["count"]; }); -/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(389); +/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(392); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__["debounce"]; }); -/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(390); +/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(393); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__["debounceTime"]; }); -/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(391); +/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(394); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__["defaultIfEmpty"]; }); -/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(392); +/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(395); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__["delay"]; }); -/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(394); +/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(397); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__["delayWhen"]; }); -/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(395); +/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(398); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__["dematerialize"]; }); -/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(396); +/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(399); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__["distinct"]; }); -/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(397); +/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(400); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__["distinctUntilChanged"]; }); -/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(398); +/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(401); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__["distinctUntilKeyChanged"]; }); -/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(399); +/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(402); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__["elementAt"]; }); -/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(404); +/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(405); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__["endWith"]; }); -/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(405); +/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(406); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "every", function() { return _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__["every"]; }); -/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(406); +/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(407); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__["exhaust"]; }); -/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(407); +/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(408); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__["exhaustMap"]; }); -/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(408); +/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(409); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__["expand"]; }); -/* harmony import */ var _internal_operators_filter__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(400); +/* harmony import */ var _internal_operators_filter__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(371); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return _internal_operators_filter__WEBPACK_IMPORTED_MODULE_30__["filter"]; }); -/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(409); +/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(410); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__["finalize"]; }); -/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(410); +/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(411); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "find", function() { return _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__["find"]; }); -/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(411); +/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(412); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__["findIndex"]; }); -/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(412); +/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(413); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "first", function() { return _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__["first"]; }); -/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(299); +/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(298); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_35__["groupBy"]; }); -/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(413); +/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(414); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__["ignoreElements"]; }); -/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(414); +/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(415); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__["isEmpty"]; }); -/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(415); +/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(416); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "last", function() { return _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__["last"]; }); -/* harmony import */ var _internal_operators_map__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(334); +/* harmony import */ var _internal_operators_map__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(333); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "map", function() { return _internal_operators_map__WEBPACK_IMPORTED_MODULE_39__["map"]; }); -/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(417); +/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(418); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__["mapTo"]; }); -/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(418); +/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(419); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__["materialize"]; }); -/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(419); +/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(420); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "max", function() { return _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__["max"]; }); -/* harmony import */ var _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(422); +/* harmony import */ var _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(423); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__["merge"]; }); -/* harmony import */ var _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(355); +/* harmony import */ var _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(348); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_44__["mergeAll"]; }); -/* harmony import */ var _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(356); +/* harmony import */ var _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(349); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__["mergeMap"]; }); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__["mergeMap"]; }); -/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(423); +/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(424); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__["mergeMapTo"]; }); -/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(424); +/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(425); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__["mergeScan"]; }); -/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(425); +/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(426); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "min", function() { return _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__["min"]; }); -/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(426); +/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(427); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__["multicast"]; }); -/* harmony import */ var _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(309); +/* harmony import */ var _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(308); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_50__["observeOn"]; }); -/* harmony import */ var _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(427); +/* harmony import */ var _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(428); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__["onErrorResumeNext"]; }); -/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(428); +/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(429); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__["pairwise"]; }); -/* harmony import */ var _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(429); +/* harmony import */ var _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(430); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__["partition"]; }); /* harmony import */ var _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(431); @@ -38968,7 +39060,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__(436); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__["race"]; }); -/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__(420); +/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__(421); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__["reduce"]; }); /* harmony import */ var _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__(437); @@ -38983,7 +39075,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__(440); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__["retryWhen"]; }); -/* harmony import */ var _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_65__ = __webpack_require__(298); +/* harmony import */ var _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_65__ = __webpack_require__(297); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_65__["refCount"]; }); /* harmony import */ var _internal_operators_sample__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__(441); @@ -38992,7 +39084,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__(442); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__["sampleTime"]; }); -/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__(421); +/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__(422); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__["scan"]; }); /* harmony import */ var _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__(443); @@ -39034,10 +39126,10 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(456); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__["switchMapTo"]; }); -/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(403); +/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(404); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "take", function() { return _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__["take"]; }); -/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(416); +/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(417); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__["takeLast"]; }); /* harmony import */ var _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(457); @@ -39046,55 +39138,55 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(458); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__["takeWhile"]; }); -/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(402); +/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(459); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__["tap"]; }); -/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(459); +/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(460); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__["throttle"]; }); -/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__(460); +/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__(461); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__["throttleTime"]; }); -/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__(401); +/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__(403); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__["throwIfEmpty"]; }); -/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__(461); +/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__(462); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__["timeInterval"]; }); -/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__(462); +/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__(463); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__["timeout"]; }); -/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__(463); +/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__(464); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__["timeoutWith"]; }); -/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__(464); +/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__(465); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__["timestamp"]; }); -/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__(465); +/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__(466); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__["toArray"]; }); -/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__(466); +/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__(467); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "window", function() { return _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__["window"]; }); -/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__(467); +/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__(468); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__["windowCount"]; }); -/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__(468); +/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__(469); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__["windowTime"]; }); -/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__(469); +/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__(470); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__["windowToggle"]; }); -/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__(470); +/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__(471); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__["windowWhen"]; }); -/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__(471); +/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__(472); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__["withLatestFrom"]; }); -/* harmony import */ var _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__(472); +/* harmony import */ var _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__(473); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__["zip"]; }); -/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__(473); +/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__(474); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__["zipAll"]; }); /** PURE_IMPORTS_START PURE_IMPORTS_END */ @@ -39206,20 +39298,16 @@ __webpack_require__.r(__webpack_exports__); /***/ }), -/* 375 */ +/* 378 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return audit; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(287); -/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(288); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(338); -/** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - - +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -39249,18 +39337,20 @@ var AuditSubscriber = /*@__PURE__*/ (function (_super) { this.value = value; this.hasValue = true; if (!this.throttled) { - var duration = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_1__["tryCatch"])(this.durationSelector)(value); - if (duration === _util_errorObject__WEBPACK_IMPORTED_MODULE_2__["errorObject"]) { - this.destination.error(_util_errorObject__WEBPACK_IMPORTED_MODULE_2__["errorObject"].e); + var duration = void 0; + try { + var durationSelector = this.durationSelector; + duration = durationSelector(value); + } + catch (err) { + return this.destination.error(err); + } + var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, duration); + if (!innerSubscription || innerSubscription.closed) { + this.clearThrottle(); } else { - var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, duration); - if (!innerSubscription || innerSubscription.closed) { - this.clearThrottle(); - } - else { - this.add(this.throttled = innerSubscription); - } + this.add(this.throttled = innerSubscription); } } }; @@ -39284,20 +39374,20 @@ var AuditSubscriber = /*@__PURE__*/ (function (_super) { this.clearThrottle(); }; return AuditSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"])); +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); //# sourceMappingURL=audit.js.map /***/ }), -/* 376 */ +/* 379 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return auditTime; }); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(323); -/* harmony import */ var _audit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(375); -/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(371); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(322); +/* harmony import */ var _audit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(378); +/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(374); /** PURE_IMPORTS_START _scheduler_async,_audit,_observable_timer PURE_IMPORTS_END */ @@ -39312,15 +39402,15 @@ function auditTime(duration, scheduler) { /***/ }), -/* 377 */ +/* 380 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return buffer; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -39361,7 +39451,7 @@ var BufferSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 378 */ +/* 381 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -39462,16 +39552,16 @@ var BufferSkipCountSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 379 */ +/* 382 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return bufferTime; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(323); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(322); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(278); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(313); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(312); /** PURE_IMPORTS_START tslib,_scheduler_async,_Subscriber,_util_isScheduler PURE_IMPORTS_END */ @@ -39623,7 +39713,7 @@ function dispatchBufferClose(arg) { /***/ }), -/* 380 */ +/* 383 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -39631,8 +39721,8 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return bufferToggle; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(336); /** PURE_IMPORTS_START tslib,_Subscription,_util_subscribeToResult,_OuterSubscriber PURE_IMPORTS_END */ @@ -39743,7 +39833,7 @@ var BufferToggleSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 381 */ +/* 384 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -39751,13 +39841,9 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return bufferWhen; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284); -/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(287); -/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(288); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(338); -/** PURE_IMPORTS_START tslib,_Subscription,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - - +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337); +/** PURE_IMPORTS_START tslib,_Subscription,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -39821,35 +39907,39 @@ var BufferWhenSubscriber = /*@__PURE__*/ (function (_super) { this.destination.next(buffer); } this.buffer = []; - var closingNotifier = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_2__["tryCatch"])(this.closingSelector)(); - if (closingNotifier === _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"]) { - this.error(_util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"].e); + var closingNotifier; + try { + var closingSelector = this.closingSelector; + closingNotifier = closingSelector(); } - else { - closingSubscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); - this.closingSubscription = closingSubscription; - this.add(closingSubscription); - this.subscribing = true; - closingSubscription.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__["subscribeToResult"])(this, closingNotifier)); - this.subscribing = false; + catch (err) { + return this.error(err); } + closingSubscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); + this.closingSubscription = closingSubscription; + this.add(closingSubscription); + this.subscribing = true; + closingSubscription.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, closingNotifier)); + this.subscribing = false; }; return BufferWhenSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__["OuterSubscriber"])); +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); //# sourceMappingURL=bufferWhen.js.map /***/ }), -/* 382 */ +/* 385 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return catchError; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336); +/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ + @@ -39888,7 +39978,9 @@ var CatchSubscriber = /*@__PURE__*/ (function (_super) { return; } this._unsubscribeAndRecycle(); - this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, result)); + var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__["InnerSubscriber"](this, undefined, undefined); + this.add(innerSubscriber); + Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, result, undefined, undefined, innerSubscriber); } }; return CatchSubscriber; @@ -39897,13 +39989,13 @@ var CatchSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 383 */ +/* 386 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return combineAll; }); -/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(336); +/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(335); /** PURE_IMPORTS_START _observable_combineLatest PURE_IMPORTS_END */ function combineAll(project) { @@ -39913,15 +40005,15 @@ function combineAll(project) { /***/ }), -/* 384 */ +/* 387 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return combineLatest; }); /* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(285); -/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336); -/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(348); +/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(335); +/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(350); /** PURE_IMPORTS_START _util_isArray,_observable_combineLatest,_observable_from PURE_IMPORTS_END */ @@ -39945,13 +40037,13 @@ function combineLatest() { /***/ }), -/* 385 */ +/* 388 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return concat; }); -/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(347); +/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(346); /** PURE_IMPORTS_START _observable_concat PURE_IMPORTS_END */ function concat() { @@ -39965,13 +40057,13 @@ function concat() { /***/ }), -/* 386 */ +/* 389 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return concatMap; }); -/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(356); +/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(349); /** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */ function concatMap(project, resultSelector) { @@ -39981,13 +40073,13 @@ function concatMap(project, resultSelector) { /***/ }), -/* 387 */ +/* 390 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return concatMapTo; }); -/* harmony import */ var _concatMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(386); +/* harmony import */ var _concatMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(389); /** PURE_IMPORTS_START _concatMap PURE_IMPORTS_END */ function concatMapTo(innerObservable, resultSelector) { @@ -39997,7 +40089,7 @@ function concatMapTo(innerObservable, resultSelector) { /***/ }), -/* 388 */ +/* 391 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -40062,15 +40154,15 @@ var CountSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 389 */ +/* 392 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return debounce; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -40150,7 +40242,7 @@ var DebounceSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 390 */ +/* 393 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -40158,7 +40250,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return debounceTime; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(323); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(322); /** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */ @@ -40226,7 +40318,7 @@ function dispatchNext(subscriber) { /***/ }), -/* 391 */ +/* 394 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -40276,17 +40368,17 @@ var DefaultIfEmptySubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 392 */ +/* 395 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return delay; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(323); -/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(393); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(322); +/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(396); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(278); -/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(310); +/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(309); /** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_Subscriber,_Notification PURE_IMPORTS_END */ @@ -40341,7 +40433,8 @@ var DelaySubscriber = /*@__PURE__*/ (function (_super) { }; DelaySubscriber.prototype._schedule = function (scheduler) { this.active = true; - this.add(scheduler.schedule(DelaySubscriber.dispatch, this.delay, { + var destination = this.destination; + destination.add(scheduler.schedule(DelaySubscriber.dispatch, this.delay, { source: this, destination: this.destination, scheduler: scheduler })); }; @@ -40363,9 +40456,11 @@ var DelaySubscriber = /*@__PURE__*/ (function (_super) { this.errored = true; this.queue = []; this.destination.error(err); + this.unsubscribe(); }; DelaySubscriber.prototype._complete = function () { this.scheduleNotification(_Notification__WEBPACK_IMPORTED_MODULE_4__["Notification"].createComplete()); + this.unsubscribe(); }; return DelaySubscriber; }(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"])); @@ -40380,7 +40475,7 @@ var DelayMessage = /*@__PURE__*/ (function () { /***/ }), -/* 393 */ +/* 396 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -40394,7 +40489,7 @@ function isDate(value) { /***/ }), -/* 394 */ +/* 397 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -40403,8 +40498,8 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(276); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(338); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(337); /** PURE_IMPORTS_START tslib,_Subscriber,_Observable,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -40436,6 +40531,7 @@ var DelayWhenSubscriber = /*@__PURE__*/ (function (_super) { _this.delayDurationSelector = delayDurationSelector; _this.completed = false; _this.delayNotifierSubscriptions = []; + _this.index = 0; return _this; } DelayWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { @@ -40454,8 +40550,9 @@ var DelayWhenSubscriber = /*@__PURE__*/ (function (_super) { this.tryComplete(); }; DelayWhenSubscriber.prototype._next = function (value) { + var index = this.index++; try { - var delayNotifier = this.delayDurationSelector(value); + var delayNotifier = this.delayDurationSelector(value, index); if (delayNotifier) { this.tryDelay(delayNotifier, value); } @@ -40467,6 +40564,7 @@ var DelayWhenSubscriber = /*@__PURE__*/ (function (_super) { DelayWhenSubscriber.prototype._complete = function () { this.completed = true; this.tryComplete(); + this.unsubscribe(); }; DelayWhenSubscriber.prototype.removeSubscription = function (subscription) { subscription.unsubscribe(); @@ -40479,7 +40577,8 @@ var DelayWhenSubscriber = /*@__PURE__*/ (function (_super) { DelayWhenSubscriber.prototype.tryDelay = function (delayNotifier, value) { var notifierSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, delayNotifier, value); if (notifierSubscription && !notifierSubscription.closed) { - this.add(notifierSubscription); + var destination = this.destination; + destination.add(notifierSubscription); this.delayNotifierSubscriptions.push(notifierSubscription); } }; @@ -40520,6 +40619,7 @@ var SubscriptionDelaySubscriber = /*@__PURE__*/ (function (_super) { this.parent.error(err); }; SubscriptionDelaySubscriber.prototype._complete = function () { + this.unsubscribe(); this.subscribeToSource(); }; SubscriptionDelaySubscriber.prototype.subscribeToSource = function () { @@ -40535,7 +40635,7 @@ var SubscriptionDelaySubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 395 */ +/* 398 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -40573,7 +40673,7 @@ var DeMaterializeSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 396 */ +/* 399 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -40581,8 +40681,8 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return distinct; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DistinctSubscriber", function() { return DistinctSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -40651,7 +40751,7 @@ var DistinctSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 397 */ +/* 400 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -40659,11 +40759,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return distinctUntilChanged; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); -/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(287); -/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(288); -/** PURE_IMPORTS_START tslib,_Subscriber,_util_tryCatch,_util_errorObject PURE_IMPORTS_END */ - - +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ function distinctUntilChanged(compare, keySelector) { @@ -40694,25 +40790,28 @@ var DistinctUntilChangedSubscriber = /*@__PURE__*/ (function (_super) { return x === y; }; DistinctUntilChangedSubscriber.prototype._next = function (value) { - var keySelector = this.keySelector; - var key = value; - if (keySelector) { - key = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_2__["tryCatch"])(this.keySelector)(value); - if (key === _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"]) { - return this.destination.error(_util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"].e); - } + var key; + try { + var keySelector = this.keySelector; + key = keySelector ? keySelector(value) : value; + } + catch (err) { + return this.destination.error(err); } var result = false; if (this.hasKey) { - result = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_2__["tryCatch"])(this.compare)(this.key, key); - if (result === _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"]) { - return this.destination.error(_util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"].e); + try { + var compare = this.compare; + result = compare(this.key, key); + } + catch (err) { + return this.destination.error(err); } } else { this.hasKey = true; } - if (Boolean(result) === false) { + if (!result) { this.key = key; this.destination.next(value); } @@ -40723,13 +40822,13 @@ var DistinctUntilChangedSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 398 */ +/* 401 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return distinctUntilKeyChanged; }); -/* harmony import */ var _distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(397); +/* harmony import */ var _distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(400); /** PURE_IMPORTS_START _distinctUntilChanged PURE_IMPORTS_END */ function distinctUntilKeyChanged(key, compare) { @@ -40739,17 +40838,17 @@ function distinctUntilKeyChanged(key, compare) { /***/ }), -/* 399 */ +/* 402 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return elementAt; }); -/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(330); -/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(400); -/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(401); -/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(391); -/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(403); +/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(329); +/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(371); +/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(403); +/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(394); +/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(404); /** PURE_IMPORTS_START _util_ArgumentOutOfRangeError,_filter,_throwIfEmpty,_defaultIfEmpty,_take PURE_IMPORTS_END */ @@ -40771,181 +40870,73 @@ function elementAt(index, defaultValue) { /***/ }), -/* 400 */ +/* 403 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return filter; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return throwIfEmpty; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); -/** 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) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__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; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=filter.js.map - - -/***/ }), -/* 401 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(330); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(278); +/** PURE_IMPORTS_START tslib,_util_EmptyError,_Subscriber PURE_IMPORTS_END */ -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return throwIfEmpty; }); -/* harmony import */ var _tap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(402); -/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(331); -/** PURE_IMPORTS_START _tap,_util_EmptyError PURE_IMPORTS_END */ -var throwIfEmpty = function (errorFactory) { +function throwIfEmpty(errorFactory) { if (errorFactory === void 0) { errorFactory = defaultErrorFactory; } - return Object(_tap__WEBPACK_IMPORTED_MODULE_0__["tap"])({ - hasValue: false, - next: function () { this.hasValue = true; }, - complete: function () { - if (!this.hasValue) { - throw errorFactory(); - } - } - }); -}; -function defaultErrorFactory() { - return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_1__["EmptyError"](); -} -//# sourceMappingURL=throwIfEmpty.js.map - - -/***/ }), -/* 402 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return tap; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); -/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(293); -/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(280); -/** PURE_IMPORTS_START tslib,_Subscriber,_util_noop,_util_isFunction PURE_IMPORTS_END */ - - - - -function tap(nextOrObserver, error, complete) { - return function tapOperatorFunction(source) { - return source.lift(new DoOperator(nextOrObserver, error, complete)); + return function (source) { + return source.lift(new ThrowIfEmptyOperator(errorFactory)); }; } -var DoOperator = /*@__PURE__*/ (function () { - function DoOperator(nextOrObserver, error, complete) { - this.nextOrObserver = nextOrObserver; - this.error = error; - this.complete = complete; +var ThrowIfEmptyOperator = /*@__PURE__*/ (function () { + function ThrowIfEmptyOperator(errorFactory) { + this.errorFactory = errorFactory; } - DoOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new TapSubscriber(subscriber, this.nextOrObserver, this.error, this.complete)); + ThrowIfEmptyOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new ThrowIfEmptySubscriber(subscriber, this.errorFactory)); }; - return DoOperator; + return ThrowIfEmptyOperator; }()); -var TapSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TapSubscriber, _super); - function TapSubscriber(destination, observerOrNext, error, complete) { +var ThrowIfEmptySubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ThrowIfEmptySubscriber, _super); + function ThrowIfEmptySubscriber(destination, errorFactory) { var _this = _super.call(this, destination) || this; - _this._tapNext = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; - _this._tapError = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; - _this._tapComplete = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; - _this._tapError = error || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; - _this._tapComplete = complete || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; - if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_3__["isFunction"])(observerOrNext)) { - _this._context = _this; - _this._tapNext = observerOrNext; - } - else if (observerOrNext) { - _this._context = observerOrNext; - _this._tapNext = observerOrNext.next || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; - _this._tapError = observerOrNext.error || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; - _this._tapComplete = observerOrNext.complete || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; - } + _this.errorFactory = errorFactory; + _this.hasValue = false; return _this; } - TapSubscriber.prototype._next = function (value) { - try { - this._tapNext.call(this._context, value); - } - catch (err) { - this.destination.error(err); - return; - } + ThrowIfEmptySubscriber.prototype._next = function (value) { + this.hasValue = true; this.destination.next(value); }; - TapSubscriber.prototype._error = function (err) { - try { - this._tapError.call(this._context, err); - } - catch (err) { + ThrowIfEmptySubscriber.prototype._complete = function () { + if (!this.hasValue) { + var err = void 0; + try { + err = this.errorFactory(); + } + catch (e) { + err = e; + } this.destination.error(err); - return; } - this.destination.error(err); - }; - TapSubscriber.prototype._complete = function () { - try { - this._tapComplete.call(this._context); - } - catch (err) { - this.destination.error(err); - return; + else { + return this.destination.complete(); } - return this.destination.complete(); }; - return TapSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=tap.js.map + return ThrowIfEmptySubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_2__["Subscriber"])); +function defaultErrorFactory() { + return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_1__["EmptyError"](); +} +//# sourceMappingURL=throwIfEmpty.js.map /***/ }), -/* 403 */ +/* 404 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -40953,8 +40944,8 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "take", function() { return take; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); -/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(330); -/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(311); +/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(329); +/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(310); /** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */ @@ -41007,21 +40998,15 @@ var TakeSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 404 */ +/* 405 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return endWith; }); -/* harmony import */ var _observable_fromArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(314); -/* harmony import */ var _observable_scalar__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(316); -/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(311); -/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(347); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(313); -/** PURE_IMPORTS_START _observable_fromArray,_observable_scalar,_observable_empty,_observable_concat,_util_isScheduler PURE_IMPORTS_END */ - - - +/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(346); +/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(311); +/** PURE_IMPORTS_START _observable_concat,_observable_of PURE_IMPORTS_END */ function endWith() { @@ -41029,31 +41014,13 @@ function endWith() { for (var _i = 0; _i < arguments.length; _i++) { array[_i] = arguments[_i]; } - return function (source) { - var scheduler = array[array.length - 1]; - if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_4__["isScheduler"])(scheduler)) { - array.pop(); - } - else { - scheduler = null; - } - var len = array.length; - if (len === 1 && !scheduler) { - return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_3__["concat"])(source, Object(_observable_scalar__WEBPACK_IMPORTED_MODULE_1__["scalar"])(array[0])); - } - else if (len > 0) { - return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_3__["concat"])(source, Object(_observable_fromArray__WEBPACK_IMPORTED_MODULE_0__["fromArray"])(array, scheduler)); - } - else { - return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_3__["concat"])(source, Object(_observable_empty__WEBPACK_IMPORTED_MODULE_2__["empty"])(scheduler)); - } - }; + return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(source, _observable_of__WEBPACK_IMPORTED_MODULE_1__["of"].apply(void 0, array)); }; } //# sourceMappingURL=endWith.js.map /***/ }), -/* 405 */ +/* 406 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -41115,15 +41082,15 @@ var EverySubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 406 */ +/* 407 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return exhaust; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -41172,18 +41139,20 @@ var SwitchFirstSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 407 */ +/* 408 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return exhaustMap; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338); -/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(334); -/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(348); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */ +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336); +/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337); +/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(333); +/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(350); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */ + @@ -41191,20 +41160,20 @@ __webpack_require__.r(__webpack_exports__); function exhaustMap(project, resultSelector) { if (resultSelector) { - return function (source) { return source.pipe(exhaustMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_4__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); }; + return function (source) { return source.pipe(exhaustMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_5__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_4__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); }; } return function (source) { - return source.lift(new ExhauseMapOperator(project)); + return source.lift(new ExhaustMapOperator(project)); }; } -var ExhauseMapOperator = /*@__PURE__*/ (function () { - function ExhauseMapOperator(project) { +var ExhaustMapOperator = /*@__PURE__*/ (function () { + function ExhaustMapOperator(project) { this.project = project; } - ExhauseMapOperator.prototype.call = function (subscriber, source) { + ExhaustMapOperator.prototype.call = function (subscriber, source) { return source.subscribe(new ExhaustMapSubscriber(subscriber, this.project)); }; - return ExhauseMapOperator; + return ExhaustMapOperator; }()); var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) { tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ExhaustMapSubscriber, _super); @@ -41222,22 +41191,30 @@ var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) { } }; ExhaustMapSubscriber.prototype.tryNext = function (value) { + var result; var index = this.index++; - var destination = this.destination; try { - var result = this.project(value, index); - this.hasSubscription = true; - this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, result, value, index)); + result = this.project(value, index); } catch (err) { - destination.error(err); + this.destination.error(err); + return; } + this.hasSubscription = true; + this._innerSub(result, value, index); + }; + ExhaustMapSubscriber.prototype._innerSub = function (result, value, index) { + var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__["InnerSubscriber"](this, undefined, undefined); + var destination = this.destination; + destination.add(innerSubscriber); + Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, result, value, index, innerSubscriber); }; ExhaustMapSubscriber.prototype._complete = function () { this.hasCompleted = true; if (!this.hasSubscription) { this.destination.complete(); } + this.unsubscribe(); }; ExhaustMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { this.destination.next(innerValue); @@ -41246,7 +41223,8 @@ var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) { this.destination.error(err); }; ExhaustMapSubscriber.prototype.notifyComplete = function (innerSub) { - this.remove(innerSub); + var destination = this.destination; + destination.remove(innerSub); this.hasSubscription = false; if (this.hasCompleted) { this.destination.complete(); @@ -41258,7 +41236,7 @@ var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 408 */ +/* 409 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -41267,13 +41245,9 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ExpandOperator", function() { return ExpandOperator; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ExpandSubscriber", function() { return ExpandSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(287); -/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(288); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(338); -/** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - - +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -41327,16 +41301,20 @@ var ExpandSubscriber = /*@__PURE__*/ (function (_super) { var index = this.index++; if (this.active < this.concurrent) { destination.next(value); - var result = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_1__["tryCatch"])(this.project)(value, index); - if (result === _util_errorObject__WEBPACK_IMPORTED_MODULE_2__["errorObject"]) { - destination.error(_util_errorObject__WEBPACK_IMPORTED_MODULE_2__["errorObject"].e); + try { + var project = this.project; + var result = project(value, index); + if (!this.scheduler) { + this.subscribeToProjection(result, value, index); + } + else { + var state = { subscriber: this, result: result, value: value, index: index }; + var destination_1 = this.destination; + destination_1.add(this.scheduler.schedule(ExpandSubscriber.dispatch, 0, state)); + } } - else if (!this.scheduler) { - this.subscribeToProjection(result, value, index); - } - else { - var state = { subscriber: this, result: result, value: value, index: index }; - this.add(this.scheduler.schedule(ExpandSubscriber.dispatch, 0, state)); + catch (e) { + destination.error(e); } } else { @@ -41345,20 +41323,23 @@ var ExpandSubscriber = /*@__PURE__*/ (function (_super) { }; ExpandSubscriber.prototype.subscribeToProjection = function (result, value, index) { this.active++; - this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, result, value, index)); + var destination = this.destination; + destination.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, result, value, index)); }; ExpandSubscriber.prototype._complete = function () { this.hasCompleted = true; if (this.hasCompleted && this.active === 0) { this.destination.complete(); } + this.unsubscribe(); }; ExpandSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { this._next(innerValue); }; ExpandSubscriber.prototype.notifyComplete = function (innerSub) { var buffer = this.buffer; - this.remove(innerSub); + var destination = this.destination; + destination.remove(innerSub); this.active--; if (buffer && buffer.length > 0) { this._next(buffer.shift()); @@ -41368,13 +41349,13 @@ var ExpandSubscriber = /*@__PURE__*/ (function (_super) { } }; return ExpandSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"])); +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); //# sourceMappingURL=expand.js.map /***/ }), -/* 409 */ +/* 410 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -41412,7 +41393,7 @@ var FinallySubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 410 */ +/* 411 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -41459,6 +41440,7 @@ var FindValueSubscriber = /*@__PURE__*/ (function (_super) { var destination = this.destination; destination.next(value); destination.complete(); + this.unsubscribe(); }; FindValueSubscriber.prototype._next = function (value) { var _a = this, predicate = _a.predicate, thisArg = _a.thisArg; @@ -41483,13 +41465,13 @@ var FindValueSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 411 */ +/* 412 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return findIndex; }); -/* harmony import */ var _operators_find__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(410); +/* harmony import */ var _operators_find__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(411); /** PURE_IMPORTS_START _operators_find PURE_IMPORTS_END */ function findIndex(predicate, thisArg) { @@ -41499,18 +41481,18 @@ function findIndex(predicate, thisArg) { /***/ }), -/* 412 */ +/* 413 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "first", function() { return first; }); -/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(331); -/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(400); -/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(403); -/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(391); -/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(401); -/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(328); +/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(330); +/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(371); +/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(404); +/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(394); +/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(403); +/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(327); /** PURE_IMPORTS_START _util_EmptyError,_filter,_take,_defaultIfEmpty,_throwIfEmpty,_util_identity PURE_IMPORTS_END */ @@ -41526,7 +41508,7 @@ function first(predicate, defaultValue) { /***/ }), -/* 413 */ +/* 414 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -41563,7 +41545,7 @@ var IgnoreElementsSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 414 */ +/* 415 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -41607,18 +41589,18 @@ var IsEmptySubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 415 */ +/* 416 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "last", function() { return last; }); -/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(331); -/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(400); -/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(416); -/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(401); -/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(391); -/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(328); +/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(330); +/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(371); +/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(417); +/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(403); +/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(394); +/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(327); /** PURE_IMPORTS_START _util_EmptyError,_filter,_takeLast,_throwIfEmpty,_defaultIfEmpty,_util_identity PURE_IMPORTS_END */ @@ -41634,7 +41616,7 @@ function last(predicate, defaultValue) { /***/ }), -/* 416 */ +/* 417 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -41642,8 +41624,8 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return takeLast; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); -/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(330); -/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(311); +/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(329); +/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(310); /** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */ @@ -41711,7 +41693,7 @@ var TakeLastSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 417 */ +/* 418 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -41750,7 +41732,7 @@ var MapToSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 418 */ +/* 419 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -41758,7 +41740,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return materialize; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); -/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(310); +/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(309); /** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */ @@ -41800,13 +41782,13 @@ var MaterializeSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 419 */ +/* 420 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "max", function() { return max; }); -/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(420); +/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(421); /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */ function max(comparer) { @@ -41819,16 +41801,16 @@ function max(comparer) { /***/ }), -/* 420 */ +/* 421 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return reduce; }); -/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(421); -/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(416); -/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(391); -/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(292); +/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(422); +/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(417); +/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(394); +/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(291); /** PURE_IMPORTS_START _scan,_takeLast,_defaultIfEmpty,_util_pipe PURE_IMPORTS_END */ @@ -41841,16 +41823,14 @@ function reduce(accumulator, seed) { }; } return function reduceOperatorFunction(source) { - return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipe"])(Object(_scan__WEBPACK_IMPORTED_MODULE_0__["scan"])(function (acc, value, index) { - return accumulator(acc, value, index + 1); - }), Object(_takeLast__WEBPACK_IMPORTED_MODULE_1__["takeLast"])(1))(source); + return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipe"])(Object(_scan__WEBPACK_IMPORTED_MODULE_0__["scan"])(function (acc, value, index) { return accumulator(acc, value, index + 1); }), Object(_takeLast__WEBPACK_IMPORTED_MODULE_1__["takeLast"])(1))(source); }; } //# sourceMappingURL=reduce.js.map /***/ }), -/* 421 */ +/* 422 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -41932,7 +41912,7 @@ var ScanSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 422 */ +/* 423 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -41952,13 +41932,13 @@ function merge() { /***/ }), -/* 423 */ +/* 424 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return mergeMapTo; }); -/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(356); +/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(349); /** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */ function mergeMapTo(innerObservable, resultSelector, concurrent) { @@ -41977,7 +41957,7 @@ function mergeMapTo(innerObservable, resultSelector, concurrent) { /***/ }), -/* 424 */ +/* 425 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -41986,12 +41966,10 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeScanOperator", function() { return MergeScanOperator; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeScanSubscriber", function() { return MergeScanSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(287); -/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(288); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(338); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(337); -/** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_util_subscribeToResult,_OuterSubscriber PURE_IMPORTS_END */ - +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(337); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(336); +/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(338); +/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_InnerSubscriber PURE_IMPORTS_END */ @@ -42031,22 +42009,27 @@ var MergeScanSubscriber = /*@__PURE__*/ (function (_super) { MergeScanSubscriber.prototype._next = function (value) { if (this.active < this.concurrent) { var index = this.index++; - var ish = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_1__["tryCatch"])(this.accumulator)(this.acc, value); var destination = this.destination; - if (ish === _util_errorObject__WEBPACK_IMPORTED_MODULE_2__["errorObject"]) { - destination.error(_util_errorObject__WEBPACK_IMPORTED_MODULE_2__["errorObject"].e); + var ish = void 0; + try { + var accumulator = this.accumulator; + ish = accumulator(this.acc, value, index); } - else { - this.active++; - this._innerSub(ish, value, index); + catch (e) { + return destination.error(e); } + this.active++; + this._innerSub(ish, value, index); } else { this.buffer.push(value); } }; MergeScanSubscriber.prototype._innerSub = function (ish, value, index) { - this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, ish, value, index)); + var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__["InnerSubscriber"](this, undefined, undefined); + var destination = this.destination; + destination.add(innerSubscriber); + Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__["subscribeToResult"])(this, ish, value, index, innerSubscriber); }; MergeScanSubscriber.prototype._complete = function () { this.hasCompleted = true; @@ -42056,6 +42039,7 @@ var MergeScanSubscriber = /*@__PURE__*/ (function (_super) { } this.destination.complete(); } + this.unsubscribe(); }; MergeScanSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { var destination = this.destination; @@ -42065,7 +42049,8 @@ var MergeScanSubscriber = /*@__PURE__*/ (function (_super) { }; MergeScanSubscriber.prototype.notifyComplete = function (innerSub) { var buffer = this.buffer; - this.remove(innerSub); + var destination = this.destination; + destination.remove(innerSub); this.active--; if (buffer.length > 0) { this._next(buffer.shift()); @@ -42078,19 +42063,19 @@ var MergeScanSubscriber = /*@__PURE__*/ (function (_super) { } }; return MergeScanSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__["OuterSubscriber"])); +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); //# sourceMappingURL=mergeScan.js.map /***/ }), -/* 425 */ +/* 426 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "min", function() { return min; }); -/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(420); +/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(421); /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */ function min(comparer) { @@ -42103,14 +42088,14 @@ function min(comparer) { /***/ }), -/* 426 */ +/* 427 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return multicast; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MulticastOperator", function() { return MulticastOperator; }); -/* harmony import */ var _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(294); +/* harmony import */ var _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(293); /** PURE_IMPORTS_START _observable_ConnectableObservable PURE_IMPORTS_END */ function multicast(subjectOrSubjectFactory, selector) { @@ -42152,7 +42137,7 @@ var MulticastOperator = /*@__PURE__*/ (function () { /***/ }), -/* 427 */ +/* 428 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -42160,11 +42145,13 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return onErrorResumeNext; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNextStatic", function() { return onErrorResumeNextStatic; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(348); +/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(350); /* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(285); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(338); -/** PURE_IMPORTS_START tslib,_observable_from,_util_isArray,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(336); +/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(338); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(337); +/** PURE_IMPORTS_START tslib,_observable_from,_util_isArray,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ + @@ -42217,14 +42204,19 @@ var OnErrorResumeNextSubscriber = /*@__PURE__*/ (function (_super) { }; OnErrorResumeNextSubscriber.prototype._error = function (err) { this.subscribeToNextSource(); + this.unsubscribe(); }; OnErrorResumeNextSubscriber.prototype._complete = function () { this.subscribeToNextSource(); + this.unsubscribe(); }; OnErrorResumeNextSubscriber.prototype.subscribeToNextSource = function () { var next = this.nextSources.shift(); - if (next) { - this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, next)); + if (!!next) { + var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_4__["InnerSubscriber"](this, undefined, undefined); + var destination = this.destination; + destination.add(innerSubscriber); + Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__["subscribeToResult"])(this, next, undefined, undefined, innerSubscriber); } else { this.destination.complete(); @@ -42236,7 +42228,7 @@ var OnErrorResumeNextSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 428 */ +/* 429 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -42266,13 +42258,17 @@ var PairwiseSubscriber = /*@__PURE__*/ (function (_super) { return _this; } PairwiseSubscriber.prototype._next = function (value) { + var pair; if (this.hasPrev) { - this.destination.next([this.prev, value]); + pair = [this.prev, value]; } else { this.hasPrev = true; } this.prev = value; + if (pair) { + this.destination.next(pair); + } }; return PairwiseSubscriber; }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); @@ -42280,14 +42276,14 @@ var PairwiseSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 429 */ +/* 430 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return partition; }); -/* harmony import */ var _util_not__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(430); -/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(400); +/* harmony import */ var _util_not__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(370); +/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(371); /** PURE_IMPORTS_START _util_not,_filter PURE_IMPORTS_END */ @@ -42302,25 +42298,6 @@ function partition(predicate, thisArg) { //# sourceMappingURL=partition.js.map -/***/ }), -/* 430 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "not", function() { return not; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -function not(pred, thisArg) { - function notPred() { - return !(notPred.pred.apply(notPred.thisArg, arguments)); - } - notPred.pred = pred; - notPred.thisArg = thisArg; - return notPred; -} -//# sourceMappingURL=not.js.map - - /***/ }), /* 431 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { @@ -42328,7 +42305,7 @@ function not(pred, thisArg) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return pluck; }); -/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(334); +/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(333); /** PURE_IMPORTS_START _map PURE_IMPORTS_END */ function pluck() { @@ -42368,8 +42345,8 @@ function plucker(props, length) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return publish; }); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(295); -/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(426); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(294); +/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(427); /** PURE_IMPORTS_START _Subject,_multicast PURE_IMPORTS_END */ @@ -42388,8 +42365,8 @@ function publish(selector) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return publishBehavior; }); -/* harmony import */ var _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(300); -/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(426); +/* harmony import */ var _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(299); +/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(427); /** PURE_IMPORTS_START _BehaviorSubject,_multicast PURE_IMPORTS_END */ @@ -42406,8 +42383,8 @@ function publishBehavior(value) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return publishLast; }); -/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(318); -/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(426); +/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(317); +/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(427); /** PURE_IMPORTS_START _AsyncSubject,_multicast PURE_IMPORTS_END */ @@ -42424,8 +42401,8 @@ function publishLast() { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return publishReplay; }); -/* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(301); -/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(426); +/* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(300); +/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(427); /** PURE_IMPORTS_START _ReplaySubject,_multicast PURE_IMPORTS_END */ @@ -42448,7 +42425,7 @@ function publishReplay(bufferSize, windowTime, selectorOrScheduler, scheduler) { __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "race", function() { return race; }); /* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(285); -/* harmony import */ var _observable_race__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(369); +/* harmony import */ var _observable_race__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(372); /** PURE_IMPORTS_START _util_isArray,_observable_race PURE_IMPORTS_END */ @@ -42476,7 +42453,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return repeat; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); -/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(311); +/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(310); /** PURE_IMPORTS_START tslib,_Subscriber,_observable_empty PURE_IMPORTS_END */ @@ -42540,14 +42517,10 @@ var RepeatSubscriber = /*@__PURE__*/ (function (_super) { __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return repeatWhen; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(295); -/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(287); -/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(288); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(338); -/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - - +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337); +/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -42616,15 +42589,19 @@ var RepeatWhenSubscriber = /*@__PURE__*/ (function (_super) { }; RepeatWhenSubscriber.prototype.subscribeToRetries = function () { this.notifications = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"](); - var retries = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_2__["tryCatch"])(this.notifier)(this.notifications); - if (retries === _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"]) { + var retries; + try { + var notifier = this.notifier; + retries = notifier(this.notifications); + } + catch (e) { return _super.prototype.complete.call(this); } this.retries = retries; - this.retriesSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__["subscribeToResult"])(this, retries); + this.retriesSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, retries); }; return RepeatWhenSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__["OuterSubscriber"])); +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); //# sourceMappingURL=repeatWhen.js.map @@ -42689,14 +42666,10 @@ var RetrySubscriber = /*@__PURE__*/ (function (_super) { __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return retryWhen; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(295); -/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(287); -/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(288); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(338); -/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - - +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337); +/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -42729,11 +42702,14 @@ var RetryWhenSubscriber = /*@__PURE__*/ (function (_super) { var retriesSubscription = this.retriesSubscription; if (!retries) { errors = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"](); - retries = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_2__["tryCatch"])(this.notifier)(errors); - if (retries === _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"]) { - return _super.prototype.error.call(this, _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"].e); + try { + var notifier = this.notifier; + retries = notifier(errors); } - retriesSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__["subscribeToResult"])(this, retries); + catch (e) { + return _super.prototype.error.call(this, e); + } + retriesSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, retries); } else { this.errors = null; @@ -42766,7 +42742,7 @@ var RetryWhenSubscriber = /*@__PURE__*/ (function (_super) { this.source.subscribe(this); }; return RetryWhenSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__["OuterSubscriber"])); +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); //# sourceMappingURL=retryWhen.js.map @@ -42778,8 +42754,8 @@ var RetryWhenSubscriber = /*@__PURE__*/ (function (_super) { __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return sample; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -42836,7 +42812,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return sampleTime; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(323); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(322); /** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */ @@ -42898,37 +42874,33 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SequenceEqualSubscriber", function() { return SequenceEqualSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); -/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(287); -/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(288); -/** PURE_IMPORTS_START tslib,_Subscriber,_util_tryCatch,_util_errorObject PURE_IMPORTS_END */ - - +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -function sequenceEqual(compareTo, comparor) { - return function (source) { return source.lift(new SequenceEqualOperator(compareTo, comparor)); }; +function sequenceEqual(compareTo, comparator) { + return function (source) { return source.lift(new SequenceEqualOperator(compareTo, comparator)); }; } var SequenceEqualOperator = /*@__PURE__*/ (function () { - function SequenceEqualOperator(compareTo, comparor) { + function SequenceEqualOperator(compareTo, comparator) { this.compareTo = compareTo; - this.comparor = comparor; + this.comparator = comparator; } SequenceEqualOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new SequenceEqualSubscriber(subscriber, this.compareTo, this.comparor)); + return source.subscribe(new SequenceEqualSubscriber(subscriber, this.compareTo, this.comparator)); }; return SequenceEqualOperator; }()); var SequenceEqualSubscriber = /*@__PURE__*/ (function (_super) { tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SequenceEqualSubscriber, _super); - function SequenceEqualSubscriber(destination, compareTo, comparor) { + function SequenceEqualSubscriber(destination, compareTo, comparator) { var _this = _super.call(this, destination) || this; _this.compareTo = compareTo; - _this.comparor = comparor; + _this.comparator = comparator; _this._a = []; _this._b = []; _this._oneComplete = false; - _this.add(compareTo.subscribe(new SequenceEqualCompareToSubscriber(destination, _this))); + _this.destination.add(compareTo.subscribe(new SequenceEqualCompareToSubscriber(destination, _this))); return _this; } SequenceEqualSubscriber.prototype._next = function (value) { @@ -42947,21 +42919,19 @@ var SequenceEqualSubscriber = /*@__PURE__*/ (function (_super) { else { this._oneComplete = true; } + this.unsubscribe(); }; SequenceEqualSubscriber.prototype.checkValues = function () { - var _c = this, _a = _c._a, _b = _c._b, comparor = _c.comparor; + var _c = this, _a = _c._a, _b = _c._b, comparator = _c.comparator; while (_a.length > 0 && _b.length > 0) { var a = _a.shift(); var b = _b.shift(); var areEqual = false; - if (comparor) { - areEqual = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_2__["tryCatch"])(comparor)(a, b); - if (areEqual === _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"]) { - this.destination.error(_util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"].e); - } + try { + areEqual = comparator ? comparator(a, b) : a === b; } - else { - areEqual = a === b; + catch (e) { + this.destination.error(e); } if (!areEqual) { this.emit(false); @@ -42982,6 +42952,14 @@ var SequenceEqualSubscriber = /*@__PURE__*/ (function (_super) { this.checkValues(); } }; + SequenceEqualSubscriber.prototype.completeB = function () { + if (this._oneComplete) { + this.emit(this._a.length === 0 && this._b.length === 0); + } + else { + this._oneComplete = true; + } + }; return SequenceEqualSubscriber; }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); @@ -42997,9 +42975,11 @@ var SequenceEqualCompareToSubscriber = /*@__PURE__*/ (function (_super) { }; SequenceEqualCompareToSubscriber.prototype._error = function (err) { this.parent.error(err); + this.unsubscribe(); }; SequenceEqualCompareToSubscriber.prototype._complete = function () { - this.parent._complete(); + this.parent.completeB(); + this.unsubscribe(); }; return SequenceEqualCompareToSubscriber; }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); @@ -43013,9 +42993,9 @@ var SequenceEqualCompareToSubscriber = /*@__PURE__*/ (function (_super) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "share", function() { return share; }); -/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(426); -/* harmony import */ var _refCount__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(298); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(295); +/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(427); +/* harmony import */ var _refCount__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(297); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(294); /** PURE_IMPORTS_START _multicast,_refCount,_Subject PURE_IMPORTS_END */ @@ -43036,13 +43016,26 @@ function share() { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return shareReplay; }); -/* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(301); +/* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(300); /** PURE_IMPORTS_START _ReplaySubject PURE_IMPORTS_END */ -function shareReplay(bufferSize, windowTime, scheduler) { - return function (source) { return source.lift(shareReplayOperator(bufferSize, windowTime, scheduler)); }; +function shareReplay(configOrBufferSize, windowTime, scheduler) { + var config; + if (configOrBufferSize && typeof configOrBufferSize === 'object') { + config = configOrBufferSize; + } + else { + config = { + bufferSize: configOrBufferSize, + windowTime: windowTime, + refCount: false, + scheduler: scheduler + }; + } + return function (source) { return source.lift(shareReplayOperator(config)); }; } -function shareReplayOperator(bufferSize, windowTime, scheduler) { +function shareReplayOperator(_a) { + var _b = _a.bufferSize, bufferSize = _b === void 0 ? Number.POSITIVE_INFINITY : _b, _c = _a.windowTime, windowTime = _c === void 0 ? Number.POSITIVE_INFINITY : _c, useRefCount = _a.refCount, scheduler = _a.scheduler; var subject; var refCount = 0; var subscription; @@ -43066,13 +43059,15 @@ function shareReplayOperator(bufferSize, windowTime, scheduler) { }); } var innerSub = subject.subscribe(this); - return function () { + this.add(function () { refCount--; innerSub.unsubscribe(); - if (subscription && refCount === 0 && isComplete) { + if (subscription && !isComplete && useRefCount && refCount === 0) { subscription.unsubscribe(); + subscription = undefined; + subject = undefined; } - }; + }); }; } //# sourceMappingURL=shareReplay.js.map @@ -43087,7 +43082,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "single", function() { return single; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); -/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(331); +/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(330); /** PURE_IMPORTS_START tslib,_Subscriber,_util_EmptyError PURE_IMPORTS_END */ @@ -43209,7 +43204,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return skipLast; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); -/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(330); +/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(329); /** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError PURE_IMPORTS_END */ @@ -43270,9 +43265,11 @@ var SkipLastSubscriber = /*@__PURE__*/ (function (_super) { __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return skipUntil; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336); +/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ + @@ -43293,7 +43290,10 @@ var SkipUntilSubscriber = /*@__PURE__*/ (function (_super) { function SkipUntilSubscriber(destination, notifier) { var _this = _super.call(this, destination) || this; _this.hasValue = false; - _this.add(_this.innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, notifier)); + var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__["InnerSubscriber"](_this, undefined, undefined); + _this.add(innerSubscriber); + _this.innerSubscription = innerSubscriber; + Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(_this, notifier, undefined, undefined, innerSubscriber); return _this; } SkipUntilSubscriber.prototype._next = function (value) { @@ -43377,15 +43377,9 @@ var SkipWhileSubscriber = /*@__PURE__*/ (function (_super) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return startWith; }); -/* harmony import */ var _observable_fromArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(314); -/* harmony import */ var _observable_scalar__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(316); -/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(311); -/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(347); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(313); -/** PURE_IMPORTS_START _observable_fromArray,_observable_scalar,_observable_empty,_observable_concat,_util_isScheduler PURE_IMPORTS_END */ - - - +/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(346); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(312); +/** PURE_IMPORTS_START _observable_concat,_util_isScheduler PURE_IMPORTS_END */ function startWith() { @@ -43393,25 +43387,14 @@ function startWith() { for (var _i = 0; _i < arguments.length; _i++) { array[_i] = arguments[_i]; } - return function (source) { - var scheduler = array[array.length - 1]; - if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_4__["isScheduler"])(scheduler)) { - array.pop(); - } - else { - scheduler = null; - } - var len = array.length; - if (len === 1 && !scheduler) { - return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_3__["concat"])(Object(_observable_scalar__WEBPACK_IMPORTED_MODULE_1__["scalar"])(array[0]), source); - } - else if (len > 0) { - return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_3__["concat"])(Object(_observable_fromArray__WEBPACK_IMPORTED_MODULE_0__["fromArray"])(array, scheduler), source); - } - else { - return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_3__["concat"])(Object(_observable_empty__WEBPACK_IMPORTED_MODULE_2__["empty"])(scheduler), source); - } - }; + var scheduler = array[array.length - 1]; + if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__["isScheduler"])(scheduler)) { + array.pop(); + return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(array, source, scheduler); }; + } + else { + return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(array, source); }; + } } //# sourceMappingURL=startWith.js.map @@ -43456,7 +43439,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubscribeOnObservable", function() { return SubscribeOnObservable; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(276); -/* harmony import */ var _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(319); +/* harmony import */ var _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(318); /* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(364); /** PURE_IMPORTS_START tslib,_Observable,_scheduler_asap,_util_isNumeric PURE_IMPORTS_END */ @@ -43519,7 +43502,7 @@ var SubscribeOnObservable = /*@__PURE__*/ (function (_super) { __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return switchAll; }); /* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(455); -/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(328); +/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(327); /** PURE_IMPORTS_START _switchMap,_util_identity PURE_IMPORTS_END */ @@ -43537,11 +43520,13 @@ function switchAll() { __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return switchMap; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338); -/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(334); -/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(348); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */ +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336); +/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337); +/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(333); +/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(350); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */ + @@ -43549,7 +43534,7 @@ __webpack_require__.r(__webpack_exports__); function switchMap(project, resultSelector) { if (typeof resultSelector === 'function') { - return function (source) { return source.pipe(switchMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_4__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); }; + return function (source) { return source.pipe(switchMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_5__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_4__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); }; } return function (source) { return source.lift(new SwitchMapOperator(project)); }; } @@ -43587,19 +43572,24 @@ var SwitchMapSubscriber = /*@__PURE__*/ (function (_super) { if (innerSubscription) { innerSubscription.unsubscribe(); } - this.add(this.innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, result, value, index)); + var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__["InnerSubscriber"](this, undefined, undefined); + var destination = this.destination; + destination.add(innerSubscriber); + this.innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, result, value, index, innerSubscriber); }; SwitchMapSubscriber.prototype._complete = function () { var innerSubscription = this.innerSubscription; if (!innerSubscription || innerSubscription.closed) { _super.prototype._complete.call(this); } + this.unsubscribe(); }; SwitchMapSubscriber.prototype._unsubscribe = function () { this.innerSubscription = null; }; SwitchMapSubscriber.prototype.notifyComplete = function (innerSub) { - this.remove(innerSub); + var destination = this.destination; + destination.remove(innerSub); this.innerSubscription = null; if (this.isStopped) { _super.prototype._complete.call(this); @@ -43637,8 +43627,8 @@ function switchMapTo(innerObservable, resultSelector) { __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return takeUntil; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -43653,7 +43643,7 @@ var TakeUntilOperator = /*@__PURE__*/ (function () { TakeUntilOperator.prototype.call = function (subscriber, source) { var takeUntilSubscriber = new TakeUntilSubscriber(subscriber); var notifierSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(takeUntilSubscriber, this.notifier); - if (notifierSubscription && !notifierSubscription.closed) { + if (notifierSubscription && !takeUntilSubscriber.seenValue) { takeUntilSubscriber.add(notifierSubscription); return source.subscribe(takeUntilSubscriber); } @@ -43664,9 +43654,12 @@ var TakeUntilOperator = /*@__PURE__*/ (function () { var TakeUntilSubscriber = /*@__PURE__*/ (function (_super) { tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeUntilSubscriber, _super); function TakeUntilSubscriber(destination) { - return _super.call(this, destination) || this; + var _this = _super.call(this, destination) || this; + _this.seenValue = false; + return _this; } TakeUntilSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.seenValue = true; this.complete(); }; TakeUntilSubscriber.prototype.notifyComplete = function () { @@ -43688,23 +43681,30 @@ __webpack_require__.r(__webpack_exports__); /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -function takeWhile(predicate) { - return function (source) { return source.lift(new TakeWhileOperator(predicate)); }; +function takeWhile(predicate, inclusive) { + if (inclusive === void 0) { + inclusive = false; + } + return function (source) { + return source.lift(new TakeWhileOperator(predicate, inclusive)); + }; } var TakeWhileOperator = /*@__PURE__*/ (function () { - function TakeWhileOperator(predicate) { + function TakeWhileOperator(predicate, inclusive) { this.predicate = predicate; + this.inclusive = inclusive; } TakeWhileOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new TakeWhileSubscriber(subscriber, this.predicate)); + return source.subscribe(new TakeWhileSubscriber(subscriber, this.predicate, this.inclusive)); }; return TakeWhileOperator; }()); var TakeWhileSubscriber = /*@__PURE__*/ (function (_super) { tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeWhileSubscriber, _super); - function TakeWhileSubscriber(destination, predicate) { + function TakeWhileSubscriber(destination, predicate, inclusive) { var _this = _super.call(this, destination) || this; _this.predicate = predicate; + _this.inclusive = inclusive; _this.index = 0; return _this; } @@ -43726,6 +43726,9 @@ var TakeWhileSubscriber = /*@__PURE__*/ (function (_super) { destination.next(value); } else { + if (this.inclusive) { + destination.next(value); + } destination.complete(); } }; @@ -43738,13 +43741,101 @@ var TakeWhileSubscriber = /*@__PURE__*/ (function (_super) { /* 459 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return tap; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); +/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(292); +/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(280); +/** PURE_IMPORTS_START tslib,_Subscriber,_util_noop,_util_isFunction PURE_IMPORTS_END */ + + + + +function tap(nextOrObserver, error, complete) { + return function tapOperatorFunction(source) { + return source.lift(new DoOperator(nextOrObserver, error, complete)); + }; +} +var DoOperator = /*@__PURE__*/ (function () { + function DoOperator(nextOrObserver, error, complete) { + this.nextOrObserver = nextOrObserver; + this.error = error; + this.complete = complete; + } + DoOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new TapSubscriber(subscriber, this.nextOrObserver, this.error, this.complete)); + }; + return DoOperator; +}()); +var TapSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TapSubscriber, _super); + function TapSubscriber(destination, observerOrNext, error, complete) { + var _this = _super.call(this, destination) || this; + _this._tapNext = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; + _this._tapError = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; + _this._tapComplete = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; + _this._tapError = error || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; + _this._tapComplete = complete || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; + if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_3__["isFunction"])(observerOrNext)) { + _this._context = _this; + _this._tapNext = observerOrNext; + } + else if (observerOrNext) { + _this._context = observerOrNext; + _this._tapNext = observerOrNext.next || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; + _this._tapError = observerOrNext.error || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; + _this._tapComplete = observerOrNext.complete || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; + } + return _this; + } + TapSubscriber.prototype._next = function (value) { + try { + this._tapNext.call(this._context, value); + } + catch (err) { + this.destination.error(err); + return; + } + this.destination.next(value); + }; + TapSubscriber.prototype._error = function (err) { + try { + this._tapError.call(this._context, err); + } + catch (err) { + this.destination.error(err); + return; + } + this.destination.error(err); + }; + TapSubscriber.prototype._complete = function () { + try { + this._tapComplete.call(this._context); + } + catch (err) { + this.destination.error(err); + return; + } + return this.destination.complete(); + }; + return TapSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=tap.js.map + + +/***/ }), +/* 460 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "defaultThrottleConfig", function() { return defaultThrottleConfig; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return throttle; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -43804,7 +43895,7 @@ var ThrottleSubscriber = /*@__PURE__*/ (function (_super) { }; ThrottleSubscriber.prototype.throttle = function (value) { var duration = this.tryDurationSelector(value); - if (duration) { + if (!!duration) { this.add(this._throttled = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, duration)); } }; @@ -43839,7 +43930,7 @@ var ThrottleSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 460 */ +/* 461 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -43847,8 +43938,8 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return throttleTime; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(323); -/* harmony import */ var _throttle__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(459); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(322); +/* harmony import */ var _throttle__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(460); /** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async,_throttle PURE_IMPORTS_END */ @@ -43899,6 +43990,10 @@ var ThrottleTimeSubscriber = /*@__PURE__*/ (function (_super) { if (this.leading) { this.destination.next(value); } + else if (this.trailing) { + this._trailingValue = value; + this._hasTrailingValue = true; + } } }; ThrottleTimeSubscriber.prototype._complete = function () { @@ -43933,17 +44028,17 @@ function dispatchNext(arg) { /***/ }), -/* 461 */ +/* 462 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return timeInterval; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TimeInterval", function() { return TimeInterval; }); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(323); -/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(421); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(322); +/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(422); /* harmony import */ var _observable_defer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(357); -/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(334); +/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(333); /** PURE_IMPORTS_START _scheduler_async,_scan,_observable_defer,_map PURE_IMPORTS_END */ @@ -43977,16 +44072,16 @@ var TimeInterval = /*@__PURE__*/ (function () { /***/ }), -/* 462 */ +/* 463 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return timeout; }); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(323); -/* harmony import */ var _util_TimeoutError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(332); -/* harmony import */ var _timeoutWith__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(463); -/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(317); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(322); +/* harmony import */ var _util_TimeoutError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(331); +/* harmony import */ var _timeoutWith__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(464); +/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(316); /** PURE_IMPORTS_START _scheduler_async,_util_TimeoutError,_timeoutWith,_observable_throwError PURE_IMPORTS_END */ @@ -44002,17 +44097,17 @@ function timeout(due, scheduler) { /***/ }), -/* 463 */ +/* 464 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return timeoutWith; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(323); -/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(393); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(338); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(322); +/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(396); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(337); /** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -44084,15 +44179,15 @@ var TimeoutWithSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 464 */ +/* 465 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return timestamp; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Timestamp", function() { return Timestamp; }); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(323); -/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(334); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(322); +/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(333); /** PURE_IMPORTS_START _scheduler_async,_map PURE_IMPORTS_END */ @@ -44114,13 +44209,13 @@ var Timestamp = /*@__PURE__*/ (function () { /***/ }), -/* 465 */ +/* 466 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return toArray; }); -/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(420); +/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(421); /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */ function toArrayReducer(arr, item, index) { @@ -44137,16 +44232,16 @@ function toArray() { /***/ }), -/* 466 */ +/* 467 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "window", function() { return window; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(295); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(338); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337); /** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -44217,7 +44312,7 @@ var WindowSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 467 */ +/* 468 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -44225,7 +44320,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return windowCount; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(295); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(294); /** PURE_IMPORTS_START tslib,_Subscriber,_Subject PURE_IMPORTS_END */ @@ -44307,18 +44402,18 @@ var WindowCountSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 468 */ +/* 469 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return windowTime; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(295); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(323); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(322); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(278); /* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(364); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(313); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(312); /** PURE_IMPORTS_START tslib,_Subject,_scheduler_async,_Subscriber,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */ @@ -44477,22 +44572,18 @@ function dispatchWindowClose(state) { /***/ }), -/* 469 */ +/* 470 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return windowToggle; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(295); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294); /* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(284); -/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(287); -/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(288); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(338); -/** PURE_IMPORTS_START tslib,_Subject,_Subscription,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - - +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(337); +/** PURE_IMPORTS_START tslib,_Subject,_Subscription,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -44518,7 +44609,7 @@ var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) { _this.openings = openings; _this.closingSelector = closingSelector; _this.contexts = []; - _this.add(_this.openSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_6__["subscribeToResult"])(_this, openings, openings)); + _this.add(_this.openSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(_this, openings, openings)); return _this; } WindowToggleSubscriber.prototype._next = function (value) { @@ -44573,26 +44664,27 @@ var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) { }; WindowToggleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { if (outerValue === this.openings) { - var closingSelector = this.closingSelector; - var closingNotifier = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_3__["tryCatch"])(closingSelector)(innerValue); - if (closingNotifier === _util_errorObject__WEBPACK_IMPORTED_MODULE_4__["errorObject"]) { - return this.error(_util_errorObject__WEBPACK_IMPORTED_MODULE_4__["errorObject"].e); + var closingNotifier = void 0; + try { + var closingSelector = this.closingSelector; + closingNotifier = closingSelector(innerValue); + } + catch (e) { + return this.error(e); + } + var window_1 = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"](); + var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"](); + var context_4 = { window: window_1, subscription: subscription }; + this.contexts.push(context_4); + var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, closingNotifier, context_4); + if (innerSubscription.closed) { + this.closeWindow(this.contexts.length - 1); } else { - var window_1 = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"](); - var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"](); - var context_4 = { window: window_1, subscription: subscription }; - this.contexts.push(context_4); - var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_6__["subscribeToResult"])(this, closingNotifier, context_4); - if (innerSubscription.closed) { - this.closeWindow(this.contexts.length - 1); - } - else { - innerSubscription.context = context_4; - subscription.add(innerSubscription); - } - this.destination.next(window_1); + innerSubscription.context = context_4; + subscription.add(innerSubscription); } + this.destination.next(window_1); } else { this.closeWindow(this.contexts.indexOf(outerValue)); @@ -44618,26 +44710,22 @@ var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) { subscription.unsubscribe(); }; return WindowToggleSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_5__["OuterSubscriber"])); +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"])); //# sourceMappingURL=windowToggle.js.map /***/ }), -/* 470 */ +/* 471 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return windowWhen; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(295); -/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(287); -/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(288); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(338); -/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - - +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337); +/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -44706,31 +44794,33 @@ var WindowSubscriber = /*@__PURE__*/ (function (_super) { } var window = this.window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"](); this.destination.next(window); - var closingNotifier = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_2__["tryCatch"])(this.closingSelector)(); - if (closingNotifier === _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"]) { - var err = _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"].e; - this.destination.error(err); - this.window.error(err); + var closingNotifier; + try { + var closingSelector = this.closingSelector; + closingNotifier = closingSelector(); } - else { - this.add(this.closingNotification = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__["subscribeToResult"])(this, closingNotifier)); + catch (e) { + this.destination.error(e); + this.window.error(e); + return; } + this.add(this.closingNotification = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, closingNotifier)); }; return WindowSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__["OuterSubscriber"])); +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); //# sourceMappingURL=windowWhen.js.map /***/ }), -/* 471 */ +/* 472 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return withLatestFrom; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(337); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -44817,13 +44907,13 @@ var WithLatestFromSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 472 */ +/* 473 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return zip; }); -/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(373); +/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(376); /** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */ function zip() { @@ -44839,13 +44929,13 @@ function zip() { /***/ }), -/* 473 */ +/* 474 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return zipAll; }); -/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(373); +/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(376); /** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */ function zipAll(project) { @@ -44855,7 +44945,7 @@ function zipAll(project) { /***/ }), -/* 474 */ +/* 475 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -44865,13 +44955,13 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__); /* harmony import */ var indent_string__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(259); /* harmony import */ var indent_string__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(indent_string__WEBPACK_IMPORTED_MODULE_1__); -/* harmony import */ var wrap_ansi__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(475); +/* harmony import */ var wrap_ansi__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(476); /* harmony import */ var wrap_ansi__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(wrap_ansi__WEBPACK_IMPORTED_MODULE_2__); /* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(172); /* harmony import */ var _utils_errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(53); /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(34); /* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(36); -/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(482); +/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(483); /* * Licensed to Elasticsearch B.V. under one or more contributor * license agreements. See the NOTICE file distributed with @@ -44949,13 +45039,13 @@ function toArray(value) { } /***/ }), -/* 475 */ +/* 476 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const stringWidth = __webpack_require__(476); -const stripAnsi = __webpack_require__(480); +const stringWidth = __webpack_require__(477); +const stripAnsi = __webpack_require__(481); const ESCAPES = new Set([ '\u001B', @@ -45149,13 +45239,13 @@ module.exports = (str, cols, opts) => { /***/ }), -/* 476 */ +/* 477 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const stripAnsi = __webpack_require__(477); -const isFullwidthCodePoint = __webpack_require__(479); +const stripAnsi = __webpack_require__(478); +const isFullwidthCodePoint = __webpack_require__(480); module.exports = str => { if (typeof str !== 'string' || str.length === 0) { @@ -45192,18 +45282,18 @@ module.exports = str => { /***/ }), -/* 477 */ +/* 478 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const ansiRegex = __webpack_require__(478); +const ansiRegex = __webpack_require__(479); module.exports = input => typeof input === 'string' ? input.replace(ansiRegex(), '') : input; /***/ }), -/* 478 */ +/* 479 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -45220,7 +45310,7 @@ module.exports = () => { /***/ }), -/* 479 */ +/* 480 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -45273,18 +45363,18 @@ module.exports = x => { /***/ }), -/* 480 */ +/* 481 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const ansiRegex = __webpack_require__(481); +const ansiRegex = __webpack_require__(482); module.exports = input => typeof input === 'string' ? input.replace(ansiRegex(), '') : input; /***/ }), -/* 481 */ +/* 482 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -45301,7 +45391,7 @@ module.exports = () => { /***/ }), -/* 482 */ +/* 483 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -45454,15 +45544,15 @@ function addProjectToTree(tree, pathParts, project) { } /***/ }), -/* 483 */ +/* 484 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony import */ var _build_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(484); +/* harmony import */ var _build_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(485); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return _build_production_projects__WEBPACK_IMPORTED_MODULE_0__["buildProductionProjects"]; }); -/* harmony import */ var _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(691); +/* harmony import */ var _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(692); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "prepareExternalProjectDependencies", function() { return _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__["prepareExternalProjectDependencies"]; }); /* @@ -45487,13 +45577,13 @@ __webpack_require__.r(__webpack_exports__); /***/ }), -/* 484 */ +/* 485 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return buildProductionProjects; }); -/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(485); +/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(486); /* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(cpy__WEBPACK_IMPORTED_MODULE_0__); /* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(174); /* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__); @@ -45633,17 +45723,17 @@ async function copyToBuild(project, kibanaRoot, buildRoot) { } /***/ }), -/* 485 */ +/* 486 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const EventEmitter = __webpack_require__(46); const path = __webpack_require__(16); -const arrify = __webpack_require__(486); -const globby = __webpack_require__(487); -const cpFile = __webpack_require__(681); -const CpyError = __webpack_require__(689); +const arrify = __webpack_require__(487); +const globby = __webpack_require__(488); +const cpFile = __webpack_require__(682); +const CpyError = __webpack_require__(690); const preprocessSrcPath = (srcPath, options) => options.cwd ? path.resolve(options.cwd, srcPath) : srcPath; @@ -45748,7 +45838,7 @@ module.exports.default = cpy; /***/ }), -/* 486 */ +/* 487 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -45763,17 +45853,17 @@ module.exports = function (val) { /***/ }), -/* 487 */ +/* 488 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const fs = __webpack_require__(23); -const arrayUnion = __webpack_require__(488); +const arrayUnion = __webpack_require__(489); const glob = __webpack_require__(37); -const fastGlob = __webpack_require__(490); -const dirGlob = __webpack_require__(674); -const gitignore = __webpack_require__(677); +const fastGlob = __webpack_require__(491); +const dirGlob = __webpack_require__(675); +const gitignore = __webpack_require__(678); const DEFAULT_FILTER = () => false; @@ -45918,12 +46008,12 @@ module.exports.gitignore = gitignore; /***/ }), -/* 488 */ +/* 489 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var arrayUniq = __webpack_require__(489); +var arrayUniq = __webpack_require__(490); module.exports = function () { return arrayUniq([].concat.apply([], arguments)); @@ -45931,7 +46021,7 @@ module.exports = function () { /***/ }), -/* 489 */ +/* 490 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -46000,10 +46090,10 @@ if ('Set' in global) { /***/ }), -/* 490 */ +/* 491 */ /***/ (function(module, exports, __webpack_require__) { -const pkg = __webpack_require__(491); +const pkg = __webpack_require__(492); module.exports = pkg.async; module.exports.default = pkg.async; @@ -46016,19 +46106,19 @@ module.exports.generateTasks = pkg.generateTasks; /***/ }), -/* 491 */ +/* 492 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var optionsManager = __webpack_require__(492); -var taskManager = __webpack_require__(493); -var reader_async_1 = __webpack_require__(645); -var reader_stream_1 = __webpack_require__(669); -var reader_sync_1 = __webpack_require__(670); -var arrayUtils = __webpack_require__(672); -var streamUtils = __webpack_require__(673); +var optionsManager = __webpack_require__(493); +var taskManager = __webpack_require__(494); +var reader_async_1 = __webpack_require__(646); +var reader_stream_1 = __webpack_require__(670); +var reader_sync_1 = __webpack_require__(671); +var arrayUtils = __webpack_require__(673); +var streamUtils = __webpack_require__(674); /** * Synchronous API. */ @@ -46094,7 +46184,7 @@ function isString(source) { /***/ }), -/* 492 */ +/* 493 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -46132,13 +46222,13 @@ exports.prepare = prepare; /***/ }), -/* 493 */ +/* 494 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var patternUtils = __webpack_require__(494); +var patternUtils = __webpack_require__(495); /** * Generate tasks based on parent directory of each pattern. */ @@ -46229,16 +46319,16 @@ exports.convertPatternGroupToTask = convertPatternGroupToTask; /***/ }), -/* 494 */ +/* 495 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var path = __webpack_require__(16); -var globParent = __webpack_require__(495); -var isGlob = __webpack_require__(498); -var micromatch = __webpack_require__(499); +var globParent = __webpack_require__(496); +var isGlob = __webpack_require__(499); +var micromatch = __webpack_require__(500); var GLOBSTAR = '**'; /** * Return true for static pattern. @@ -46384,15 +46474,15 @@ exports.matchAny = matchAny; /***/ }), -/* 495 */ +/* 496 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var path = __webpack_require__(16); -var isglob = __webpack_require__(496); -var pathDirname = __webpack_require__(497); +var isglob = __webpack_require__(497); +var pathDirname = __webpack_require__(498); var isWin32 = __webpack_require__(11).platform() === 'win32'; module.exports = function globParent(str) { @@ -46415,7 +46505,7 @@ module.exports = function globParent(str) { /***/ }), -/* 496 */ +/* 497 */ /***/ (function(module, exports, __webpack_require__) { /*! @@ -46446,7 +46536,7 @@ module.exports = function isGlob(str) { /***/ }), -/* 497 */ +/* 498 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -46596,7 +46686,7 @@ module.exports.win32 = win32; /***/ }), -/* 498 */ +/* 499 */ /***/ (function(module, exports, __webpack_require__) { /*! @@ -46648,7 +46738,7 @@ module.exports = function isGlob(str, options) { /***/ }), -/* 499 */ +/* 500 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -46659,18 +46749,18 @@ module.exports = function isGlob(str, options) { */ var util = __webpack_require__(29); -var braces = __webpack_require__(500); -var toRegex = __webpack_require__(603); -var extend = __webpack_require__(611); +var braces = __webpack_require__(501); +var toRegex = __webpack_require__(604); +var extend = __webpack_require__(612); /** * Local dependencies */ -var compilers = __webpack_require__(614); -var parsers = __webpack_require__(641); -var cache = __webpack_require__(642); -var utils = __webpack_require__(643); +var compilers = __webpack_require__(615); +var parsers = __webpack_require__(642); +var cache = __webpack_require__(643); +var utils = __webpack_require__(644); var MAX_LENGTH = 1024 * 64; /** @@ -47532,7 +47622,7 @@ module.exports = micromatch; /***/ }), -/* 500 */ +/* 501 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -47542,18 +47632,18 @@ module.exports = micromatch; * Module dependencies */ -var toRegex = __webpack_require__(501); -var unique = __webpack_require__(513); -var extend = __webpack_require__(510); +var toRegex = __webpack_require__(502); +var unique = __webpack_require__(514); +var extend = __webpack_require__(511); /** * Local dependencies */ -var compilers = __webpack_require__(514); -var parsers = __webpack_require__(529); -var Braces = __webpack_require__(539); -var utils = __webpack_require__(515); +var compilers = __webpack_require__(515); +var parsers = __webpack_require__(530); +var Braces = __webpack_require__(540); +var utils = __webpack_require__(516); var MAX_LENGTH = 1024 * 64; var cache = {}; @@ -47857,15 +47947,15 @@ module.exports = braces; /***/ }), -/* 501 */ +/* 502 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var define = __webpack_require__(502); -var extend = __webpack_require__(510); -var not = __webpack_require__(512); +var define = __webpack_require__(503); +var extend = __webpack_require__(511); +var not = __webpack_require__(513); var MAX_LENGTH = 1024 * 64; /** @@ -48012,7 +48102,7 @@ module.exports.makeRe = makeRe; /***/ }), -/* 502 */ +/* 503 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -48025,7 +48115,7 @@ module.exports.makeRe = makeRe; -var isDescriptor = __webpack_require__(503); +var isDescriptor = __webpack_require__(504); module.exports = function defineProperty(obj, prop, val) { if (typeof obj !== 'object' && typeof obj !== 'function') { @@ -48050,7 +48140,7 @@ module.exports = function defineProperty(obj, prop, val) { /***/ }), -/* 503 */ +/* 504 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -48063,9 +48153,9 @@ module.exports = function defineProperty(obj, prop, val) { -var typeOf = __webpack_require__(504); -var isAccessor = __webpack_require__(505); -var isData = __webpack_require__(508); +var typeOf = __webpack_require__(505); +var isAccessor = __webpack_require__(506); +var isData = __webpack_require__(509); module.exports = function isDescriptor(obj, key) { if (typeOf(obj) !== 'object') { @@ -48079,7 +48169,7 @@ module.exports = function isDescriptor(obj, key) { /***/ }), -/* 504 */ +/* 505 */ /***/ (function(module, exports) { var toString = Object.prototype.toString; @@ -48232,7 +48322,7 @@ function isBuffer(val) { /***/ }), -/* 505 */ +/* 506 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -48245,7 +48335,7 @@ function isBuffer(val) { -var typeOf = __webpack_require__(506); +var typeOf = __webpack_require__(507); // accessor descriptor properties var accessor = { @@ -48308,10 +48398,10 @@ module.exports = isAccessorDescriptor; /***/ }), -/* 506 */ +/* 507 */ /***/ (function(module, exports, __webpack_require__) { -var isBuffer = __webpack_require__(507); +var isBuffer = __webpack_require__(508); var toString = Object.prototype.toString; /** @@ -48430,7 +48520,7 @@ module.exports = function kindOf(val) { /***/ }), -/* 507 */ +/* 508 */ /***/ (function(module, exports) { /*! @@ -48457,7 +48547,7 @@ function isSlowBuffer (obj) { /***/ }), -/* 508 */ +/* 509 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -48470,7 +48560,7 @@ function isSlowBuffer (obj) { -var typeOf = __webpack_require__(509); +var typeOf = __webpack_require__(510); // data descriptor properties var data = { @@ -48519,10 +48609,10 @@ module.exports = isDataDescriptor; /***/ }), -/* 509 */ +/* 510 */ /***/ (function(module, exports, __webpack_require__) { -var isBuffer = __webpack_require__(507); +var isBuffer = __webpack_require__(508); var toString = Object.prototype.toString; /** @@ -48641,13 +48731,13 @@ module.exports = function kindOf(val) { /***/ }), -/* 510 */ +/* 511 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isObject = __webpack_require__(511); +var isObject = __webpack_require__(512); module.exports = function extend(o/*, objects*/) { if (!isObject(o)) { o = {}; } @@ -48681,7 +48771,7 @@ function hasOwn(obj, key) { /***/ }), -/* 511 */ +/* 512 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -48701,13 +48791,13 @@ module.exports = function isExtendable(val) { /***/ }), -/* 512 */ +/* 513 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var extend = __webpack_require__(510); +var extend = __webpack_require__(511); /** * The main export is a function that takes a `pattern` string and an `options` object. @@ -48774,7 +48864,7 @@ module.exports = toRegex; /***/ }), -/* 513 */ +/* 514 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -48824,13 +48914,13 @@ module.exports.immutable = function uniqueImmutable(arr) { /***/ }), -/* 514 */ +/* 515 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var utils = __webpack_require__(515); +var utils = __webpack_require__(516); module.exports = function(braces, options) { braces.compiler @@ -49113,25 +49203,25 @@ function hasQueue(node) { /***/ }), -/* 515 */ +/* 516 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var splitString = __webpack_require__(516); +var splitString = __webpack_require__(517); var utils = module.exports; /** * Module dependencies */ -utils.extend = __webpack_require__(510); -utils.flatten = __webpack_require__(522); -utils.isObject = __webpack_require__(520); -utils.fillRange = __webpack_require__(523); -utils.repeat = __webpack_require__(528); -utils.unique = __webpack_require__(513); +utils.extend = __webpack_require__(511); +utils.flatten = __webpack_require__(523); +utils.isObject = __webpack_require__(521); +utils.fillRange = __webpack_require__(524); +utils.repeat = __webpack_require__(529); +utils.unique = __webpack_require__(514); utils.define = function(obj, key, val) { Object.defineProperty(obj, key, { @@ -49463,7 +49553,7 @@ utils.escapeRegex = function(str) { /***/ }), -/* 516 */ +/* 517 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -49476,7 +49566,7 @@ utils.escapeRegex = function(str) { -var extend = __webpack_require__(517); +var extend = __webpack_require__(518); module.exports = function(str, options, fn) { if (typeof str !== 'string') { @@ -49641,14 +49731,14 @@ function keepEscaping(opts, str, idx) { /***/ }), -/* 517 */ +/* 518 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isExtendable = __webpack_require__(518); -var assignSymbols = __webpack_require__(521); +var isExtendable = __webpack_require__(519); +var assignSymbols = __webpack_require__(522); module.exports = Object.assign || function(obj/*, objects*/) { if (obj === null || typeof obj === 'undefined') { @@ -49708,7 +49798,7 @@ function isEnum(obj, key) { /***/ }), -/* 518 */ +/* 519 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -49721,7 +49811,7 @@ function isEnum(obj, key) { -var isPlainObject = __webpack_require__(519); +var isPlainObject = __webpack_require__(520); module.exports = function isExtendable(val) { return isPlainObject(val) || typeof val === 'function' || Array.isArray(val); @@ -49729,7 +49819,7 @@ module.exports = function isExtendable(val) { /***/ }), -/* 519 */ +/* 520 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -49742,7 +49832,7 @@ module.exports = function isExtendable(val) { -var isObject = __webpack_require__(520); +var isObject = __webpack_require__(521); function isObjectObject(o) { return isObject(o) === true @@ -49773,7 +49863,7 @@ module.exports = function isPlainObject(o) { /***/ }), -/* 520 */ +/* 521 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -49792,7 +49882,7 @@ module.exports = function isObject(val) { /***/ }), -/* 521 */ +/* 522 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -49839,7 +49929,7 @@ module.exports = function(receiver, objects) { /***/ }), -/* 522 */ +/* 523 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -49868,7 +49958,7 @@ function flat(arr, res) { /***/ }), -/* 523 */ +/* 524 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -49882,10 +49972,10 @@ function flat(arr, res) { var util = __webpack_require__(29); -var isNumber = __webpack_require__(524); -var extend = __webpack_require__(510); -var repeat = __webpack_require__(526); -var toRegex = __webpack_require__(527); +var isNumber = __webpack_require__(525); +var extend = __webpack_require__(511); +var repeat = __webpack_require__(527); +var toRegex = __webpack_require__(528); /** * Return a range of numbers or letters. @@ -50083,7 +50173,7 @@ module.exports = fillRange; /***/ }), -/* 524 */ +/* 525 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -50096,7 +50186,7 @@ module.exports = fillRange; -var typeOf = __webpack_require__(525); +var typeOf = __webpack_require__(526); module.exports = function isNumber(num) { var type = typeOf(num); @@ -50112,10 +50202,10 @@ module.exports = function isNumber(num) { /***/ }), -/* 525 */ +/* 526 */ /***/ (function(module, exports, __webpack_require__) { -var isBuffer = __webpack_require__(507); +var isBuffer = __webpack_require__(508); var toString = Object.prototype.toString; /** @@ -50234,7 +50324,7 @@ module.exports = function kindOf(val) { /***/ }), -/* 526 */ +/* 527 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -50311,7 +50401,7 @@ function repeat(str, num) { /***/ }), -/* 527 */ +/* 528 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -50324,8 +50414,8 @@ function repeat(str, num) { -var repeat = __webpack_require__(526); -var isNumber = __webpack_require__(524); +var repeat = __webpack_require__(527); +var isNumber = __webpack_require__(525); var cache = {}; function toRegexRange(min, max, options) { @@ -50612,7 +50702,7 @@ module.exports = toRegexRange; /***/ }), -/* 528 */ +/* 529 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -50637,14 +50727,14 @@ module.exports = function repeat(ele, num) { /***/ }), -/* 529 */ +/* 530 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var Node = __webpack_require__(530); -var utils = __webpack_require__(515); +var Node = __webpack_require__(531); +var utils = __webpack_require__(516); /** * Braces parsers @@ -51004,15 +51094,15 @@ function concatNodes(pos, node, parent, options) { /***/ }), -/* 530 */ +/* 531 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isObject = __webpack_require__(520); -var define = __webpack_require__(531); -var utils = __webpack_require__(538); +var isObject = __webpack_require__(521); +var define = __webpack_require__(532); +var utils = __webpack_require__(539); var ownNames; /** @@ -51503,7 +51593,7 @@ exports = module.exports = Node; /***/ }), -/* 531 */ +/* 532 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -51516,7 +51606,7 @@ exports = module.exports = Node; -var isDescriptor = __webpack_require__(532); +var isDescriptor = __webpack_require__(533); module.exports = function defineProperty(obj, prop, val) { if (typeof obj !== 'object' && typeof obj !== 'function') { @@ -51541,7 +51631,7 @@ module.exports = function defineProperty(obj, prop, val) { /***/ }), -/* 532 */ +/* 533 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -51554,9 +51644,9 @@ module.exports = function defineProperty(obj, prop, val) { -var typeOf = __webpack_require__(533); -var isAccessor = __webpack_require__(534); -var isData = __webpack_require__(536); +var typeOf = __webpack_require__(534); +var isAccessor = __webpack_require__(535); +var isData = __webpack_require__(537); module.exports = function isDescriptor(obj, key) { if (typeOf(obj) !== 'object') { @@ -51569,219 +51659,8 @@ module.exports = function isDescriptor(obj, key) { }; -/***/ }), -/* 533 */ -/***/ (function(module, exports) { - -var toString = Object.prototype.toString; - -module.exports = function kindOf(val) { - if (val === void 0) return 'undefined'; - if (val === null) return 'null'; - - var type = typeof val; - if (type === 'boolean') return 'boolean'; - if (type === 'string') return 'string'; - if (type === 'number') return 'number'; - if (type === 'symbol') return 'symbol'; - if (type === 'function') { - return isGeneratorFn(val) ? 'generatorfunction' : 'function'; - } - - if (isArray(val)) return 'array'; - if (isBuffer(val)) return 'buffer'; - if (isArguments(val)) return 'arguments'; - if (isDate(val)) return 'date'; - if (isError(val)) return 'error'; - if (isRegexp(val)) return 'regexp'; - - switch (ctorName(val)) { - case 'Symbol': return 'symbol'; - case 'Promise': return 'promise'; - - // Set, Map, WeakSet, WeakMap - case 'WeakMap': return 'weakmap'; - case 'WeakSet': return 'weakset'; - case 'Map': return 'map'; - case 'Set': return 'set'; - - // 8-bit typed arrays - case 'Int8Array': return 'int8array'; - case 'Uint8Array': return 'uint8array'; - case 'Uint8ClampedArray': return 'uint8clampedarray'; - - // 16-bit typed arrays - case 'Int16Array': return 'int16array'; - case 'Uint16Array': return 'uint16array'; - - // 32-bit typed arrays - case 'Int32Array': return 'int32array'; - case 'Uint32Array': return 'uint32array'; - case 'Float32Array': return 'float32array'; - case 'Float64Array': return 'float64array'; - } - - if (isGeneratorObj(val)) { - return 'generator'; - } - - // Non-plain objects - type = toString.call(val); - switch (type) { - case '[object Object]': return 'object'; - // iterators - case '[object Map Iterator]': return 'mapiterator'; - case '[object Set Iterator]': return 'setiterator'; - case '[object String Iterator]': return 'stringiterator'; - case '[object Array Iterator]': return 'arrayiterator'; - } - - // other - return type.slice(8, -1).toLowerCase().replace(/\s/g, ''); -}; - -function ctorName(val) { - return val.constructor ? val.constructor.name : null; -} - -function isArray(val) { - if (Array.isArray) return Array.isArray(val); - return val instanceof Array; -} - -function isError(val) { - return val instanceof Error || (typeof val.message === 'string' && val.constructor && typeof val.constructor.stackTraceLimit === 'number'); -} - -function isDate(val) { - if (val instanceof Date) return true; - return typeof val.toDateString === 'function' - && typeof val.getDate === 'function' - && typeof val.setDate === 'function'; -} - -function isRegexp(val) { - if (val instanceof RegExp) return true; - return typeof val.flags === 'string' - && typeof val.ignoreCase === 'boolean' - && typeof val.multiline === 'boolean' - && typeof val.global === 'boolean'; -} - -function isGeneratorFn(name, val) { - return ctorName(name) === 'GeneratorFunction'; -} - -function isGeneratorObj(val) { - return typeof val.throw === 'function' - && typeof val.return === 'function' - && typeof val.next === 'function'; -} - -function isArguments(val) { - try { - if (typeof val.length === 'number' && typeof val.callee === 'function') { - return true; - } - } catch (err) { - if (err.message.indexOf('callee') !== -1) { - return true; - } - } - return false; -} - -/** - * If you need to support Safari 5-7 (8-10 yr-old browser), - * take a look at https://github.com/feross/is-buffer - */ - -function isBuffer(val) { - if (val.constructor && typeof val.constructor.isBuffer === 'function') { - return val.constructor.isBuffer(val); - } - return false; -} - - /***/ }), /* 534 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; -/*! - * is-accessor-descriptor - * - * Copyright (c) 2015-2017, Jon Schlinkert. - * Released under the MIT License. - */ - - - -var typeOf = __webpack_require__(535); - -// accessor descriptor properties -var accessor = { - get: 'function', - set: 'function', - configurable: 'boolean', - enumerable: 'boolean' -}; - -function isAccessorDescriptor(obj, prop) { - if (typeof prop === 'string') { - var val = Object.getOwnPropertyDescriptor(obj, prop); - return typeof val !== 'undefined'; - } - - if (typeOf(obj) !== 'object') { - return false; - } - - if (has(obj, 'value') || has(obj, 'writable')) { - return false; - } - - if (!has(obj, 'get') || typeof obj.get !== 'function') { - return false; - } - - // tldr: it's valid to have "set" be undefined - // "set" might be undefined if `Object.getOwnPropertyDescriptor` - // was used to get the value, and only `get` was defined by the user - if (has(obj, 'set') && typeof obj[key] !== 'function' && typeof obj[key] !== 'undefined') { - return false; - } - - for (var key in obj) { - if (!accessor.hasOwnProperty(key)) { - continue; - } - - if (typeOf(obj[key]) === accessor[key]) { - continue; - } - - if (typeof obj[key] !== 'undefined') { - return false; - } - } - return true; -} - -function has(obj, key) { - return {}.hasOwnProperty.call(obj, key); -} - -/** - * Expose `isAccessorDescriptor` - */ - -module.exports = isAccessorDescriptor; - - -/***/ }), -/* 535 */ /***/ (function(module, exports) { var toString = Object.prototype.toString; @@ -51915,8 +51794,219 @@ function isBuffer(val) { } +/***/ }), +/* 535 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/*! + * is-accessor-descriptor + * + * Copyright (c) 2015-2017, Jon Schlinkert. + * Released under the MIT License. + */ + + + +var typeOf = __webpack_require__(536); + +// accessor descriptor properties +var accessor = { + get: 'function', + set: 'function', + configurable: 'boolean', + enumerable: 'boolean' +}; + +function isAccessorDescriptor(obj, prop) { + if (typeof prop === 'string') { + var val = Object.getOwnPropertyDescriptor(obj, prop); + return typeof val !== 'undefined'; + } + + if (typeOf(obj) !== 'object') { + return false; + } + + if (has(obj, 'value') || has(obj, 'writable')) { + return false; + } + + if (!has(obj, 'get') || typeof obj.get !== 'function') { + return false; + } + + // tldr: it's valid to have "set" be undefined + // "set" might be undefined if `Object.getOwnPropertyDescriptor` + // was used to get the value, and only `get` was defined by the user + if (has(obj, 'set') && typeof obj[key] !== 'function' && typeof obj[key] !== 'undefined') { + return false; + } + + for (var key in obj) { + if (!accessor.hasOwnProperty(key)) { + continue; + } + + if (typeOf(obj[key]) === accessor[key]) { + continue; + } + + if (typeof obj[key] !== 'undefined') { + return false; + } + } + return true; +} + +function has(obj, key) { + return {}.hasOwnProperty.call(obj, key); +} + +/** + * Expose `isAccessorDescriptor` + */ + +module.exports = isAccessorDescriptor; + + /***/ }), /* 536 */ +/***/ (function(module, exports) { + +var toString = Object.prototype.toString; + +module.exports = function kindOf(val) { + if (val === void 0) return 'undefined'; + if (val === null) return 'null'; + + var type = typeof val; + if (type === 'boolean') return 'boolean'; + if (type === 'string') return 'string'; + if (type === 'number') return 'number'; + if (type === 'symbol') return 'symbol'; + if (type === 'function') { + return isGeneratorFn(val) ? 'generatorfunction' : 'function'; + } + + if (isArray(val)) return 'array'; + if (isBuffer(val)) return 'buffer'; + if (isArguments(val)) return 'arguments'; + if (isDate(val)) return 'date'; + if (isError(val)) return 'error'; + if (isRegexp(val)) return 'regexp'; + + switch (ctorName(val)) { + case 'Symbol': return 'symbol'; + case 'Promise': return 'promise'; + + // Set, Map, WeakSet, WeakMap + case 'WeakMap': return 'weakmap'; + case 'WeakSet': return 'weakset'; + case 'Map': return 'map'; + case 'Set': return 'set'; + + // 8-bit typed arrays + case 'Int8Array': return 'int8array'; + case 'Uint8Array': return 'uint8array'; + case 'Uint8ClampedArray': return 'uint8clampedarray'; + + // 16-bit typed arrays + case 'Int16Array': return 'int16array'; + case 'Uint16Array': return 'uint16array'; + + // 32-bit typed arrays + case 'Int32Array': return 'int32array'; + case 'Uint32Array': return 'uint32array'; + case 'Float32Array': return 'float32array'; + case 'Float64Array': return 'float64array'; + } + + if (isGeneratorObj(val)) { + return 'generator'; + } + + // Non-plain objects + type = toString.call(val); + switch (type) { + case '[object Object]': return 'object'; + // iterators + case '[object Map Iterator]': return 'mapiterator'; + case '[object Set Iterator]': return 'setiterator'; + case '[object String Iterator]': return 'stringiterator'; + case '[object Array Iterator]': return 'arrayiterator'; + } + + // other + return type.slice(8, -1).toLowerCase().replace(/\s/g, ''); +}; + +function ctorName(val) { + return val.constructor ? val.constructor.name : null; +} + +function isArray(val) { + if (Array.isArray) return Array.isArray(val); + return val instanceof Array; +} + +function isError(val) { + return val instanceof Error || (typeof val.message === 'string' && val.constructor && typeof val.constructor.stackTraceLimit === 'number'); +} + +function isDate(val) { + if (val instanceof Date) return true; + return typeof val.toDateString === 'function' + && typeof val.getDate === 'function' + && typeof val.setDate === 'function'; +} + +function isRegexp(val) { + if (val instanceof RegExp) return true; + return typeof val.flags === 'string' + && typeof val.ignoreCase === 'boolean' + && typeof val.multiline === 'boolean' + && typeof val.global === 'boolean'; +} + +function isGeneratorFn(name, val) { + return ctorName(name) === 'GeneratorFunction'; +} + +function isGeneratorObj(val) { + return typeof val.throw === 'function' + && typeof val.return === 'function' + && typeof val.next === 'function'; +} + +function isArguments(val) { + try { + if (typeof val.length === 'number' && typeof val.callee === 'function') { + return true; + } + } catch (err) { + if (err.message.indexOf('callee') !== -1) { + return true; + } + } + return false; +} + +/** + * If you need to support Safari 5-7 (8-10 yr-old browser), + * take a look at https://github.com/feross/is-buffer + */ + +function isBuffer(val) { + if (val.constructor && typeof val.constructor.isBuffer === 'function') { + return val.constructor.isBuffer(val); + } + return false; +} + + +/***/ }), +/* 537 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -51929,7 +52019,7 @@ function isBuffer(val) { -var typeOf = __webpack_require__(537); +var typeOf = __webpack_require__(538); module.exports = function isDataDescriptor(obj, prop) { // data descriptor properties @@ -51972,7 +52062,7 @@ module.exports = function isDataDescriptor(obj, prop) { /***/ }), -/* 537 */ +/* 538 */ /***/ (function(module, exports) { var toString = Object.prototype.toString; @@ -52107,13 +52197,13 @@ function isBuffer(val) { /***/ }), -/* 538 */ +/* 539 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var typeOf = __webpack_require__(525); +var typeOf = __webpack_require__(526); var utils = module.exports; /** @@ -53133,17 +53223,17 @@ function assert(val, message) { /***/ }), -/* 539 */ +/* 540 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var extend = __webpack_require__(510); -var Snapdragon = __webpack_require__(540); -var compilers = __webpack_require__(514); -var parsers = __webpack_require__(529); -var utils = __webpack_require__(515); +var extend = __webpack_require__(511); +var Snapdragon = __webpack_require__(541); +var compilers = __webpack_require__(515); +var parsers = __webpack_require__(530); +var utils = __webpack_require__(516); /** * Customize Snapdragon parser and renderer @@ -53244,17 +53334,17 @@ module.exports = Braces; /***/ }), -/* 540 */ +/* 541 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var Base = __webpack_require__(541); -var define = __webpack_require__(502); -var Compiler = __webpack_require__(570); -var Parser = __webpack_require__(600); -var utils = __webpack_require__(580); +var Base = __webpack_require__(542); +var define = __webpack_require__(503); +var Compiler = __webpack_require__(571); +var Parser = __webpack_require__(601); +var utils = __webpack_require__(581); var regexCache = {}; var cache = {}; @@ -53425,20 +53515,20 @@ module.exports.Parser = Parser; /***/ }), -/* 541 */ +/* 542 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var util = __webpack_require__(29); -var define = __webpack_require__(542); -var CacheBase = __webpack_require__(543); -var Emitter = __webpack_require__(544); -var isObject = __webpack_require__(520); -var merge = __webpack_require__(561); -var pascal = __webpack_require__(564); -var cu = __webpack_require__(565); +var define = __webpack_require__(543); +var CacheBase = __webpack_require__(544); +var Emitter = __webpack_require__(545); +var isObject = __webpack_require__(521); +var merge = __webpack_require__(562); +var pascal = __webpack_require__(565); +var cu = __webpack_require__(566); /** * Optionally define a custom `cache` namespace to use. @@ -53867,7 +53957,7 @@ module.exports.namespace = namespace; /***/ }), -/* 542 */ +/* 543 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -53880,7 +53970,7 @@ module.exports.namespace = namespace; -var isDescriptor = __webpack_require__(532); +var isDescriptor = __webpack_require__(533); module.exports = function defineProperty(obj, prop, val) { if (typeof obj !== 'object' && typeof obj !== 'function') { @@ -53905,21 +53995,21 @@ module.exports = function defineProperty(obj, prop, val) { /***/ }), -/* 543 */ +/* 544 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isObject = __webpack_require__(520); -var Emitter = __webpack_require__(544); -var visit = __webpack_require__(545); -var toPath = __webpack_require__(548); -var union = __webpack_require__(549); -var del = __webpack_require__(553); -var get = __webpack_require__(551); -var has = __webpack_require__(558); -var set = __webpack_require__(552); +var isObject = __webpack_require__(521); +var Emitter = __webpack_require__(545); +var visit = __webpack_require__(546); +var toPath = __webpack_require__(549); +var union = __webpack_require__(550); +var del = __webpack_require__(554); +var get = __webpack_require__(552); +var has = __webpack_require__(559); +var set = __webpack_require__(553); /** * Create a `Cache` constructor that when instantiated will @@ -54173,7 +54263,7 @@ module.exports.namespace = namespace; /***/ }), -/* 544 */ +/* 545 */ /***/ (function(module, exports, __webpack_require__) { @@ -54342,7 +54432,7 @@ Emitter.prototype.hasListeners = function(event){ /***/ }), -/* 545 */ +/* 546 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -54355,8 +54445,8 @@ Emitter.prototype.hasListeners = function(event){ -var visit = __webpack_require__(546); -var mapVisit = __webpack_require__(547); +var visit = __webpack_require__(547); +var mapVisit = __webpack_require__(548); module.exports = function(collection, method, val) { var result; @@ -54379,7 +54469,7 @@ module.exports = function(collection, method, val) { /***/ }), -/* 546 */ +/* 547 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -54392,7 +54482,7 @@ module.exports = function(collection, method, val) { -var isObject = __webpack_require__(520); +var isObject = __webpack_require__(521); module.exports = function visit(thisArg, method, target, val) { if (!isObject(thisArg) && typeof thisArg !== 'function') { @@ -54419,14 +54509,14 @@ module.exports = function visit(thisArg, method, target, val) { /***/ }), -/* 547 */ +/* 548 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var util = __webpack_require__(29); -var visit = __webpack_require__(546); +var visit = __webpack_require__(547); /** * Map `visit` over an array of objects. @@ -54463,7 +54553,7 @@ function isObject(val) { /***/ }), -/* 548 */ +/* 549 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -54476,7 +54566,7 @@ function isObject(val) { -var typeOf = __webpack_require__(525); +var typeOf = __webpack_require__(526); module.exports = function toPath(args) { if (typeOf(args) !== 'arguments') { @@ -54503,16 +54593,16 @@ function filter(arr) { /***/ }), -/* 549 */ +/* 550 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isObject = __webpack_require__(511); -var union = __webpack_require__(550); -var get = __webpack_require__(551); -var set = __webpack_require__(552); +var isObject = __webpack_require__(512); +var union = __webpack_require__(551); +var get = __webpack_require__(552); +var set = __webpack_require__(553); module.exports = function unionValue(obj, prop, value) { if (!isObject(obj)) { @@ -54540,7 +54630,7 @@ function arrayify(val) { /***/ }), -/* 550 */ +/* 551 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -54576,7 +54666,7 @@ module.exports = function union(init) { /***/ }), -/* 551 */ +/* 552 */ /***/ (function(module, exports) { /*! @@ -54632,7 +54722,7 @@ function toString(val) { /***/ }), -/* 552 */ +/* 553 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -54645,10 +54735,10 @@ function toString(val) { -var split = __webpack_require__(516); -var extend = __webpack_require__(510); -var isPlainObject = __webpack_require__(519); -var isObject = __webpack_require__(511); +var split = __webpack_require__(517); +var extend = __webpack_require__(511); +var isPlainObject = __webpack_require__(520); +var isObject = __webpack_require__(512); module.exports = function(obj, prop, val) { if (!isObject(obj)) { @@ -54694,7 +54784,7 @@ function isValidKey(key) { /***/ }), -/* 553 */ +/* 554 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -54707,8 +54797,8 @@ function isValidKey(key) { -var isObject = __webpack_require__(520); -var has = __webpack_require__(554); +var isObject = __webpack_require__(521); +var has = __webpack_require__(555); module.exports = function unset(obj, prop) { if (!isObject(obj)) { @@ -54733,7 +54823,7 @@ module.exports = function unset(obj, prop) { /***/ }), -/* 554 */ +/* 555 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -54746,9 +54836,9 @@ module.exports = function unset(obj, prop) { -var isObject = __webpack_require__(555); -var hasValues = __webpack_require__(557); -var get = __webpack_require__(551); +var isObject = __webpack_require__(556); +var hasValues = __webpack_require__(558); +var get = __webpack_require__(552); module.exports = function(obj, prop, noZero) { if (isObject(obj)) { @@ -54759,7 +54849,7 @@ module.exports = function(obj, prop, noZero) { /***/ }), -/* 555 */ +/* 556 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -54772,7 +54862,7 @@ module.exports = function(obj, prop, noZero) { -var isArray = __webpack_require__(556); +var isArray = __webpack_require__(557); module.exports = function isObject(val) { return val != null && typeof val === 'object' && isArray(val) === false; @@ -54780,7 +54870,7 @@ module.exports = function isObject(val) { /***/ }), -/* 556 */ +/* 557 */ /***/ (function(module, exports) { var toString = {}.toString; @@ -54791,7 +54881,7 @@ module.exports = Array.isArray || function (arr) { /***/ }), -/* 557 */ +/* 558 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -54834,7 +54924,7 @@ module.exports = function hasValue(o, noZero) { /***/ }), -/* 558 */ +/* 559 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -54847,9 +54937,9 @@ module.exports = function hasValue(o, noZero) { -var isObject = __webpack_require__(520); -var hasValues = __webpack_require__(559); -var get = __webpack_require__(551); +var isObject = __webpack_require__(521); +var hasValues = __webpack_require__(560); +var get = __webpack_require__(552); module.exports = function(val, prop) { return hasValues(isObject(val) && prop ? get(val, prop) : val); @@ -54857,7 +54947,7 @@ module.exports = function(val, prop) { /***/ }), -/* 559 */ +/* 560 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -54870,8 +54960,8 @@ module.exports = function(val, prop) { -var typeOf = __webpack_require__(560); -var isNumber = __webpack_require__(524); +var typeOf = __webpack_require__(561); +var isNumber = __webpack_require__(525); module.exports = function hasValue(val) { // is-number checks for NaN and other edge cases @@ -54924,10 +55014,10 @@ module.exports = function hasValue(val) { /***/ }), -/* 560 */ +/* 561 */ /***/ (function(module, exports, __webpack_require__) { -var isBuffer = __webpack_require__(507); +var isBuffer = __webpack_require__(508); var toString = Object.prototype.toString; /** @@ -55049,14 +55139,14 @@ module.exports = function kindOf(val) { /***/ }), -/* 561 */ +/* 562 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isExtendable = __webpack_require__(562); -var forIn = __webpack_require__(563); +var isExtendable = __webpack_require__(563); +var forIn = __webpack_require__(564); function mixinDeep(target, objects) { var len = arguments.length, i = 0; @@ -55120,7 +55210,7 @@ module.exports = mixinDeep; /***/ }), -/* 562 */ +/* 563 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -55133,7 +55223,7 @@ module.exports = mixinDeep; -var isPlainObject = __webpack_require__(519); +var isPlainObject = __webpack_require__(520); module.exports = function isExtendable(val) { return isPlainObject(val) || typeof val === 'function' || Array.isArray(val); @@ -55141,7 +55231,7 @@ module.exports = function isExtendable(val) { /***/ }), -/* 563 */ +/* 564 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -55164,7 +55254,7 @@ module.exports = function forIn(obj, fn, thisArg) { /***/ }), -/* 564 */ +/* 565 */ /***/ (function(module, exports) { /*! @@ -55191,14 +55281,14 @@ module.exports = pascalcase; /***/ }), -/* 565 */ +/* 566 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var util = __webpack_require__(29); -var utils = __webpack_require__(566); +var utils = __webpack_require__(567); /** * Expose class utils @@ -55563,7 +55653,7 @@ cu.bubble = function(Parent, events) { /***/ }), -/* 566 */ +/* 567 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -55577,10 +55667,10 @@ var utils = {}; * Lazily required module dependencies */ -utils.union = __webpack_require__(550); -utils.define = __webpack_require__(502); -utils.isObj = __webpack_require__(520); -utils.staticExtend = __webpack_require__(567); +utils.union = __webpack_require__(551); +utils.define = __webpack_require__(503); +utils.isObj = __webpack_require__(521); +utils.staticExtend = __webpack_require__(568); /** @@ -55591,7 +55681,7 @@ module.exports = utils; /***/ }), -/* 567 */ +/* 568 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -55604,8 +55694,8 @@ module.exports = utils; -var copy = __webpack_require__(568); -var define = __webpack_require__(502); +var copy = __webpack_require__(569); +var define = __webpack_require__(503); var util = __webpack_require__(29); /** @@ -55688,15 +55778,15 @@ module.exports = extend; /***/ }), -/* 568 */ +/* 569 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var typeOf = __webpack_require__(525); -var copyDescriptor = __webpack_require__(569); -var define = __webpack_require__(502); +var typeOf = __webpack_require__(526); +var copyDescriptor = __webpack_require__(570); +var define = __webpack_require__(503); /** * Copy static properties, prototype properties, and descriptors from one object to another. @@ -55869,7 +55959,7 @@ module.exports.has = has; /***/ }), -/* 569 */ +/* 570 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -55957,16 +56047,16 @@ function isObject(val) { /***/ }), -/* 570 */ +/* 571 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var use = __webpack_require__(571); -var define = __webpack_require__(502); -var debug = __webpack_require__(573)('snapdragon:compiler'); -var utils = __webpack_require__(580); +var use = __webpack_require__(572); +var define = __webpack_require__(503); +var debug = __webpack_require__(574)('snapdragon:compiler'); +var utils = __webpack_require__(581); /** * Create a new `Compiler` with the given `options`. @@ -56120,7 +56210,7 @@ Compiler.prototype = { // source map support if (opts.sourcemap) { - var sourcemaps = __webpack_require__(599); + var sourcemaps = __webpack_require__(600); sourcemaps(this); this.mapVisit(this.ast.nodes); this.applySourceMaps(); @@ -56141,7 +56231,7 @@ module.exports = Compiler; /***/ }), -/* 571 */ +/* 572 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -56154,7 +56244,7 @@ module.exports = Compiler; -var utils = __webpack_require__(572); +var utils = __webpack_require__(573); module.exports = function base(app, opts) { if (!utils.isObject(app) && typeof app !== 'function') { @@ -56269,7 +56359,7 @@ module.exports = function base(app, opts) { /***/ }), -/* 572 */ +/* 573 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -56283,8 +56373,8 @@ var utils = {}; * Lazily required module dependencies */ -utils.define = __webpack_require__(502); -utils.isObject = __webpack_require__(520); +utils.define = __webpack_require__(503); +utils.isObject = __webpack_require__(521); utils.isString = function(val) { @@ -56299,7 +56389,7 @@ module.exports = utils; /***/ }), -/* 573 */ +/* 574 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -56308,14 +56398,14 @@ module.exports = utils; */ if (typeof process !== 'undefined' && process.type === 'renderer') { - module.exports = __webpack_require__(574); + module.exports = __webpack_require__(575); } else { - module.exports = __webpack_require__(577); + module.exports = __webpack_require__(578); } /***/ }), -/* 574 */ +/* 575 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -56324,7 +56414,7 @@ if (typeof process !== 'undefined' && process.type === 'renderer') { * Expose `debug()` as the module. */ -exports = module.exports = __webpack_require__(575); +exports = module.exports = __webpack_require__(576); exports.log = log; exports.formatArgs = formatArgs; exports.save = save; @@ -56506,7 +56596,7 @@ function localstorage() { /***/ }), -/* 575 */ +/* 576 */ /***/ (function(module, exports, __webpack_require__) { @@ -56522,7 +56612,7 @@ exports.coerce = coerce; exports.disable = disable; exports.enable = enable; exports.enabled = enabled; -exports.humanize = __webpack_require__(576); +exports.humanize = __webpack_require__(577); /** * The currently active debug mode names, and names to skip. @@ -56714,7 +56804,7 @@ function coerce(val) { /***/ }), -/* 576 */ +/* 577 */ /***/ (function(module, exports) { /** @@ -56872,14 +56962,14 @@ function plural(ms, n, name) { /***/ }), -/* 577 */ +/* 578 */ /***/ (function(module, exports, __webpack_require__) { /** * Module dependencies. */ -var tty = __webpack_require__(578); +var tty = __webpack_require__(579); var util = __webpack_require__(29); /** @@ -56888,7 +56978,7 @@ var util = __webpack_require__(29); * Expose `debug()` as the module. */ -exports = module.exports = __webpack_require__(575); +exports = module.exports = __webpack_require__(576); exports.init = init; exports.log = log; exports.formatArgs = formatArgs; @@ -57067,7 +57157,7 @@ function createWritableStdioStream (fd) { case 'PIPE': case 'TCP': - var net = __webpack_require__(579); + var net = __webpack_require__(580); stream = new net.Socket({ fd: fd, readable: false, @@ -57126,19 +57216,19 @@ exports.enable(load()); /***/ }), -/* 578 */ +/* 579 */ /***/ (function(module, exports) { module.exports = require("tty"); /***/ }), -/* 579 */ +/* 580 */ /***/ (function(module, exports) { module.exports = require("net"); /***/ }), -/* 580 */ +/* 581 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -57148,9 +57238,9 @@ module.exports = require("net"); * Module dependencies */ -exports.extend = __webpack_require__(510); -exports.SourceMap = __webpack_require__(581); -exports.sourceMapResolve = __webpack_require__(592); +exports.extend = __webpack_require__(511); +exports.SourceMap = __webpack_require__(582); +exports.sourceMapResolve = __webpack_require__(593); /** * Convert backslash in the given string to forward slashes @@ -57193,7 +57283,7 @@ exports.last = function(arr, n) { /***/ }), -/* 581 */ +/* 582 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -57201,13 +57291,13 @@ exports.last = function(arr, n) { * Licensed under the New BSD license. See LICENSE.txt or: * http://opensource.org/licenses/BSD-3-Clause */ -exports.SourceMapGenerator = __webpack_require__(582).SourceMapGenerator; -exports.SourceMapConsumer = __webpack_require__(588).SourceMapConsumer; -exports.SourceNode = __webpack_require__(591).SourceNode; +exports.SourceMapGenerator = __webpack_require__(583).SourceMapGenerator; +exports.SourceMapConsumer = __webpack_require__(589).SourceMapConsumer; +exports.SourceNode = __webpack_require__(592).SourceNode; /***/ }), -/* 582 */ +/* 583 */ /***/ (function(module, exports, __webpack_require__) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -57217,10 +57307,10 @@ exports.SourceNode = __webpack_require__(591).SourceNode; * http://opensource.org/licenses/BSD-3-Clause */ -var base64VLQ = __webpack_require__(583); -var util = __webpack_require__(585); -var ArraySet = __webpack_require__(586).ArraySet; -var MappingList = __webpack_require__(587).MappingList; +var base64VLQ = __webpack_require__(584); +var util = __webpack_require__(586); +var ArraySet = __webpack_require__(587).ArraySet; +var MappingList = __webpack_require__(588).MappingList; /** * An instance of the SourceMapGenerator represents a source map which is @@ -57629,7 +57719,7 @@ exports.SourceMapGenerator = SourceMapGenerator; /***/ }), -/* 583 */ +/* 584 */ /***/ (function(module, exports, __webpack_require__) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -57669,7 +57759,7 @@ exports.SourceMapGenerator = SourceMapGenerator; * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -var base64 = __webpack_require__(584); +var base64 = __webpack_require__(585); // A single base 64 digit can contain 6 bits of data. For the base 64 variable // length quantities we use in the source map spec, the first bit is the sign, @@ -57775,7 +57865,7 @@ exports.decode = function base64VLQ_decode(aStr, aIndex, aOutParam) { /***/ }), -/* 584 */ +/* 585 */ /***/ (function(module, exports) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -57848,7 +57938,7 @@ exports.decode = function (charCode) { /***/ }), -/* 585 */ +/* 586 */ /***/ (function(module, exports) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -58271,7 +58361,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate /***/ }), -/* 586 */ +/* 587 */ /***/ (function(module, exports, __webpack_require__) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -58281,7 +58371,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate * http://opensource.org/licenses/BSD-3-Clause */ -var util = __webpack_require__(585); +var util = __webpack_require__(586); var has = Object.prototype.hasOwnProperty; var hasNativeMap = typeof Map !== "undefined"; @@ -58398,7 +58488,7 @@ exports.ArraySet = ArraySet; /***/ }), -/* 587 */ +/* 588 */ /***/ (function(module, exports, __webpack_require__) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -58408,7 +58498,7 @@ exports.ArraySet = ArraySet; * http://opensource.org/licenses/BSD-3-Clause */ -var util = __webpack_require__(585); +var util = __webpack_require__(586); /** * Determine whether mappingB is after mappingA with respect to generated @@ -58483,7 +58573,7 @@ exports.MappingList = MappingList; /***/ }), -/* 588 */ +/* 589 */ /***/ (function(module, exports, __webpack_require__) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -58493,11 +58583,11 @@ exports.MappingList = MappingList; * http://opensource.org/licenses/BSD-3-Clause */ -var util = __webpack_require__(585); -var binarySearch = __webpack_require__(589); -var ArraySet = __webpack_require__(586).ArraySet; -var base64VLQ = __webpack_require__(583); -var quickSort = __webpack_require__(590).quickSort; +var util = __webpack_require__(586); +var binarySearch = __webpack_require__(590); +var ArraySet = __webpack_require__(587).ArraySet; +var base64VLQ = __webpack_require__(584); +var quickSort = __webpack_require__(591).quickSort; function SourceMapConsumer(aSourceMap) { var sourceMap = aSourceMap; @@ -59571,7 +59661,7 @@ exports.IndexedSourceMapConsumer = IndexedSourceMapConsumer; /***/ }), -/* 589 */ +/* 590 */ /***/ (function(module, exports) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -59688,7 +59778,7 @@ exports.search = function search(aNeedle, aHaystack, aCompare, aBias) { /***/ }), -/* 590 */ +/* 591 */ /***/ (function(module, exports) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -59808,7 +59898,7 @@ exports.quickSort = function (ary, comparator) { /***/ }), -/* 591 */ +/* 592 */ /***/ (function(module, exports, __webpack_require__) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -59818,8 +59908,8 @@ exports.quickSort = function (ary, comparator) { * http://opensource.org/licenses/BSD-3-Clause */ -var SourceMapGenerator = __webpack_require__(582).SourceMapGenerator; -var util = __webpack_require__(585); +var SourceMapGenerator = __webpack_require__(583).SourceMapGenerator; +var util = __webpack_require__(586); // Matches a Windows-style `\r\n` newline or a `\n` newline used by all other // operating systems these days (capturing the result). @@ -60227,17 +60317,17 @@ exports.SourceNode = SourceNode; /***/ }), -/* 592 */ +/* 593 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2014, 2015, 2016, 2017 Simon Lydell // X11 (“MIT”) Licensed. (See LICENSE.) -var sourceMappingURL = __webpack_require__(593) -var resolveUrl = __webpack_require__(594) -var decodeUriComponent = __webpack_require__(595) -var urix = __webpack_require__(597) -var atob = __webpack_require__(598) +var sourceMappingURL = __webpack_require__(594) +var resolveUrl = __webpack_require__(595) +var decodeUriComponent = __webpack_require__(596) +var urix = __webpack_require__(598) +var atob = __webpack_require__(599) @@ -60535,7 +60625,7 @@ module.exports = { /***/ }), -/* 593 */ +/* 594 */ /***/ (function(module, exports, __webpack_require__) { var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright 2014 Simon Lydell @@ -60598,7 +60688,7 @@ void (function(root, factory) { /***/ }), -/* 594 */ +/* 595 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2014 Simon Lydell @@ -60616,13 +60706,13 @@ module.exports = resolveUrl /***/ }), -/* 595 */ +/* 596 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2017 Simon Lydell // X11 (“MIT”) Licensed. (See LICENSE.) -var decodeUriComponent = __webpack_require__(596) +var decodeUriComponent = __webpack_require__(597) function customDecodeUriComponent(string) { // `decodeUriComponent` turns `+` into ` `, but that's not wanted. @@ -60633,7 +60723,7 @@ module.exports = customDecodeUriComponent /***/ }), -/* 596 */ +/* 597 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -60734,7 +60824,7 @@ module.exports = function (encodedURI) { /***/ }), -/* 597 */ +/* 598 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2014 Simon Lydell @@ -60757,7 +60847,7 @@ module.exports = urix /***/ }), -/* 598 */ +/* 599 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -60771,7 +60861,7 @@ module.exports = atob.atob = atob; /***/ }), -/* 599 */ +/* 600 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -60779,8 +60869,8 @@ module.exports = atob.atob = atob; var fs = __webpack_require__(23); var path = __webpack_require__(16); -var define = __webpack_require__(502); -var utils = __webpack_require__(580); +var define = __webpack_require__(503); +var utils = __webpack_require__(581); /** * Expose `mixin()`. @@ -60923,19 +61013,19 @@ exports.comment = function(node) { /***/ }), -/* 600 */ +/* 601 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var use = __webpack_require__(571); +var use = __webpack_require__(572); var util = __webpack_require__(29); -var Cache = __webpack_require__(601); -var define = __webpack_require__(502); -var debug = __webpack_require__(573)('snapdragon:parser'); -var Position = __webpack_require__(602); -var utils = __webpack_require__(580); +var Cache = __webpack_require__(602); +var define = __webpack_require__(503); +var debug = __webpack_require__(574)('snapdragon:parser'); +var Position = __webpack_require__(603); +var utils = __webpack_require__(581); /** * Create a new `Parser` with the given `input` and `options`. @@ -61463,7 +61553,7 @@ module.exports = Parser; /***/ }), -/* 601 */ +/* 602 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -61570,13 +61660,13 @@ MapCache.prototype.del = function mapDelete(key) { /***/ }), -/* 602 */ +/* 603 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var define = __webpack_require__(502); +var define = __webpack_require__(503); /** * Store position for a node @@ -61591,16 +61681,16 @@ module.exports = function Position(start, parser) { /***/ }), -/* 603 */ +/* 604 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var safe = __webpack_require__(604); -var define = __webpack_require__(610); -var extend = __webpack_require__(611); -var not = __webpack_require__(613); +var safe = __webpack_require__(605); +var define = __webpack_require__(611); +var extend = __webpack_require__(612); +var not = __webpack_require__(614); var MAX_LENGTH = 1024 * 64; /** @@ -61753,10 +61843,10 @@ module.exports.makeRe = makeRe; /***/ }), -/* 604 */ +/* 605 */ /***/ (function(module, exports, __webpack_require__) { -var parse = __webpack_require__(605); +var parse = __webpack_require__(606); var types = parse.types; module.exports = function (re, opts) { @@ -61802,13 +61892,13 @@ function isRegExp (x) { /***/ }), -/* 605 */ +/* 606 */ /***/ (function(module, exports, __webpack_require__) { -var util = __webpack_require__(606); -var types = __webpack_require__(607); -var sets = __webpack_require__(608); -var positions = __webpack_require__(609); +var util = __webpack_require__(607); +var types = __webpack_require__(608); +var sets = __webpack_require__(609); +var positions = __webpack_require__(610); module.exports = function(regexpStr) { @@ -62090,11 +62180,11 @@ module.exports.types = types; /***/ }), -/* 606 */ +/* 607 */ /***/ (function(module, exports, __webpack_require__) { -var types = __webpack_require__(607); -var sets = __webpack_require__(608); +var types = __webpack_require__(608); +var sets = __webpack_require__(609); // All of these are private and only used by randexp. @@ -62207,7 +62297,7 @@ exports.error = function(regexp, msg) { /***/ }), -/* 607 */ +/* 608 */ /***/ (function(module, exports) { module.exports = { @@ -62223,10 +62313,10 @@ module.exports = { /***/ }), -/* 608 */ +/* 609 */ /***/ (function(module, exports, __webpack_require__) { -var types = __webpack_require__(607); +var types = __webpack_require__(608); var INTS = function() { return [{ type: types.RANGE , from: 48, to: 57 }]; @@ -62311,10 +62401,10 @@ exports.anyChar = function() { /***/ }), -/* 609 */ +/* 610 */ /***/ (function(module, exports, __webpack_require__) { -var types = __webpack_require__(607); +var types = __webpack_require__(608); exports.wordBoundary = function() { return { type: types.POSITION, value: 'b' }; @@ -62334,7 +62424,7 @@ exports.end = function() { /***/ }), -/* 610 */ +/* 611 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -62347,8 +62437,8 @@ exports.end = function() { -var isobject = __webpack_require__(520); -var isDescriptor = __webpack_require__(532); +var isobject = __webpack_require__(521); +var isDescriptor = __webpack_require__(533); var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty) ? Reflect.defineProperty : Object.defineProperty; @@ -62379,14 +62469,14 @@ module.exports = function defineProperty(obj, key, val) { /***/ }), -/* 611 */ +/* 612 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isExtendable = __webpack_require__(612); -var assignSymbols = __webpack_require__(521); +var isExtendable = __webpack_require__(613); +var assignSymbols = __webpack_require__(522); module.exports = Object.assign || function(obj/*, objects*/) { if (obj === null || typeof obj === 'undefined') { @@ -62446,7 +62536,7 @@ function isEnum(obj, key) { /***/ }), -/* 612 */ +/* 613 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -62459,7 +62549,7 @@ function isEnum(obj, key) { -var isPlainObject = __webpack_require__(519); +var isPlainObject = __webpack_require__(520); module.exports = function isExtendable(val) { return isPlainObject(val) || typeof val === 'function' || Array.isArray(val); @@ -62467,14 +62557,14 @@ module.exports = function isExtendable(val) { /***/ }), -/* 613 */ +/* 614 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var extend = __webpack_require__(611); -var safe = __webpack_require__(604); +var extend = __webpack_require__(612); +var safe = __webpack_require__(605); /** * The main export is a function that takes a `pattern` string and an `options` object. @@ -62546,14 +62636,14 @@ module.exports = toRegex; /***/ }), -/* 614 */ +/* 615 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var nanomatch = __webpack_require__(615); -var extglob = __webpack_require__(630); +var nanomatch = __webpack_require__(616); +var extglob = __webpack_require__(631); module.exports = function(snapdragon) { var compilers = snapdragon.compiler.compilers; @@ -62630,7 +62720,7 @@ function escapeExtglobs(compiler) { /***/ }), -/* 615 */ +/* 616 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -62641,17 +62731,17 @@ function escapeExtglobs(compiler) { */ var util = __webpack_require__(29); -var toRegex = __webpack_require__(501); -var extend = __webpack_require__(616); +var toRegex = __webpack_require__(502); +var extend = __webpack_require__(617); /** * Local dependencies */ -var compilers = __webpack_require__(618); -var parsers = __webpack_require__(619); -var cache = __webpack_require__(622); -var utils = __webpack_require__(624); +var compilers = __webpack_require__(619); +var parsers = __webpack_require__(620); +var cache = __webpack_require__(623); +var utils = __webpack_require__(625); var MAX_LENGTH = 1024 * 64; /** @@ -63475,14 +63565,14 @@ module.exports = nanomatch; /***/ }), -/* 616 */ +/* 617 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isExtendable = __webpack_require__(617); -var assignSymbols = __webpack_require__(521); +var isExtendable = __webpack_require__(618); +var assignSymbols = __webpack_require__(522); module.exports = Object.assign || function(obj/*, objects*/) { if (obj === null || typeof obj === 'undefined') { @@ -63542,7 +63632,7 @@ function isEnum(obj, key) { /***/ }), -/* 617 */ +/* 618 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -63555,7 +63645,7 @@ function isEnum(obj, key) { -var isPlainObject = __webpack_require__(519); +var isPlainObject = __webpack_require__(520); module.exports = function isExtendable(val) { return isPlainObject(val) || typeof val === 'function' || Array.isArray(val); @@ -63563,7 +63653,7 @@ module.exports = function isExtendable(val) { /***/ }), -/* 618 */ +/* 619 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -63909,15 +63999,15 @@ module.exports = function(nanomatch, options) { /***/ }), -/* 619 */ +/* 620 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var regexNot = __webpack_require__(512); -var toRegex = __webpack_require__(501); -var isOdd = __webpack_require__(620); +var regexNot = __webpack_require__(513); +var toRegex = __webpack_require__(502); +var isOdd = __webpack_require__(621); /** * Characters to use in negation regex (we want to "not" match @@ -64303,7 +64393,7 @@ module.exports.not = NOT_REGEX; /***/ }), -/* 620 */ +/* 621 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64316,7 +64406,7 @@ module.exports.not = NOT_REGEX; -var isNumber = __webpack_require__(621); +var isNumber = __webpack_require__(622); module.exports = function isOdd(i) { if (!isNumber(i)) { @@ -64330,7 +64420,7 @@ module.exports = function isOdd(i) { /***/ }), -/* 621 */ +/* 622 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64358,14 +64448,14 @@ module.exports = function isNumber(num) { /***/ }), -/* 622 */ +/* 623 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = new (__webpack_require__(623))(); +module.exports = new (__webpack_require__(624))(); /***/ }), -/* 623 */ +/* 624 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64378,7 +64468,7 @@ module.exports = new (__webpack_require__(623))(); -var MapCache = __webpack_require__(601); +var MapCache = __webpack_require__(602); /** * Create a new `FragmentCache` with an optional object to use for `caches`. @@ -64500,7 +64590,7 @@ exports = module.exports = FragmentCache; /***/ }), -/* 624 */ +/* 625 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64513,14 +64603,14 @@ var path = __webpack_require__(16); * Module dependencies */ -var isWindows = __webpack_require__(625)(); -var Snapdragon = __webpack_require__(540); -utils.define = __webpack_require__(626); -utils.diff = __webpack_require__(627); -utils.extend = __webpack_require__(616); -utils.pick = __webpack_require__(628); -utils.typeOf = __webpack_require__(629); -utils.unique = __webpack_require__(513); +var isWindows = __webpack_require__(626)(); +var Snapdragon = __webpack_require__(541); +utils.define = __webpack_require__(627); +utils.diff = __webpack_require__(628); +utils.extend = __webpack_require__(617); +utils.pick = __webpack_require__(629); +utils.typeOf = __webpack_require__(630); +utils.unique = __webpack_require__(514); /** * Returns true if the given value is effectively an empty string @@ -64886,7 +64976,7 @@ utils.unixify = function(options) { /***/ }), -/* 625 */ +/* 626 */ /***/ (function(module, exports, __webpack_require__) { var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*! @@ -64914,7 +65004,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ /***/ }), -/* 626 */ +/* 627 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64927,8 +65017,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ -var isobject = __webpack_require__(520); -var isDescriptor = __webpack_require__(532); +var isobject = __webpack_require__(521); +var isDescriptor = __webpack_require__(533); var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty) ? Reflect.defineProperty : Object.defineProperty; @@ -64959,7 +65049,7 @@ module.exports = function defineProperty(obj, key, val) { /***/ }), -/* 627 */ +/* 628 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -65013,7 +65103,7 @@ function diffArray(one, two) { /***/ }), -/* 628 */ +/* 629 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -65026,7 +65116,7 @@ function diffArray(one, two) { -var isObject = __webpack_require__(520); +var isObject = __webpack_require__(521); module.exports = function pick(obj, keys) { if (!isObject(obj) && typeof obj !== 'function') { @@ -65055,7 +65145,7 @@ module.exports = function pick(obj, keys) { /***/ }), -/* 629 */ +/* 630 */ /***/ (function(module, exports) { var toString = Object.prototype.toString; @@ -65190,7 +65280,7 @@ function isBuffer(val) { /***/ }), -/* 630 */ +/* 631 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -65200,18 +65290,18 @@ function isBuffer(val) { * Module dependencies */ -var extend = __webpack_require__(510); -var unique = __webpack_require__(513); -var toRegex = __webpack_require__(501); +var extend = __webpack_require__(511); +var unique = __webpack_require__(514); +var toRegex = __webpack_require__(502); /** * Local dependencies */ -var compilers = __webpack_require__(631); -var parsers = __webpack_require__(637); -var Extglob = __webpack_require__(640); -var utils = __webpack_require__(639); +var compilers = __webpack_require__(632); +var parsers = __webpack_require__(638); +var Extglob = __webpack_require__(641); +var utils = __webpack_require__(640); var MAX_LENGTH = 1024 * 64; /** @@ -65528,13 +65618,13 @@ module.exports = extglob; /***/ }), -/* 631 */ +/* 632 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var brackets = __webpack_require__(632); +var brackets = __webpack_require__(633); /** * Extglob compilers @@ -65704,7 +65794,7 @@ module.exports = function(extglob) { /***/ }), -/* 632 */ +/* 633 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -65714,17 +65804,17 @@ module.exports = function(extglob) { * Local dependencies */ -var compilers = __webpack_require__(633); -var parsers = __webpack_require__(635); +var compilers = __webpack_require__(634); +var parsers = __webpack_require__(636); /** * Module dependencies */ -var debug = __webpack_require__(573)('expand-brackets'); -var extend = __webpack_require__(510); -var Snapdragon = __webpack_require__(540); -var toRegex = __webpack_require__(501); +var debug = __webpack_require__(574)('expand-brackets'); +var extend = __webpack_require__(511); +var Snapdragon = __webpack_require__(541); +var toRegex = __webpack_require__(502); /** * Parses the given POSIX character class `pattern` and returns a @@ -65922,13 +66012,13 @@ module.exports = brackets; /***/ }), -/* 633 */ +/* 634 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var posix = __webpack_require__(634); +var posix = __webpack_require__(635); module.exports = function(brackets) { brackets.compiler @@ -66016,7 +66106,7 @@ module.exports = function(brackets) { /***/ }), -/* 634 */ +/* 635 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -66045,14 +66135,14 @@ module.exports = { /***/ }), -/* 635 */ +/* 636 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var utils = __webpack_require__(636); -var define = __webpack_require__(502); +var utils = __webpack_require__(637); +var define = __webpack_require__(503); /** * Text regex @@ -66271,14 +66361,14 @@ module.exports.TEXT_REGEX = TEXT_REGEX; /***/ }), -/* 636 */ +/* 637 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var toRegex = __webpack_require__(501); -var regexNot = __webpack_require__(512); +var toRegex = __webpack_require__(502); +var regexNot = __webpack_require__(513); var cached; /** @@ -66312,15 +66402,15 @@ exports.createRegex = function(pattern, include) { /***/ }), -/* 637 */ +/* 638 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var brackets = __webpack_require__(632); -var define = __webpack_require__(638); -var utils = __webpack_require__(639); +var brackets = __webpack_require__(633); +var define = __webpack_require__(639); +var utils = __webpack_require__(640); /** * Characters to use in text regex (we want to "not" match @@ -66475,7 +66565,7 @@ module.exports = parsers; /***/ }), -/* 638 */ +/* 639 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -66488,7 +66578,7 @@ module.exports = parsers; -var isDescriptor = __webpack_require__(532); +var isDescriptor = __webpack_require__(533); module.exports = function defineProperty(obj, prop, val) { if (typeof obj !== 'object' && typeof obj !== 'function') { @@ -66513,14 +66603,14 @@ module.exports = function defineProperty(obj, prop, val) { /***/ }), -/* 639 */ +/* 640 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var regex = __webpack_require__(512); -var Cache = __webpack_require__(623); +var regex = __webpack_require__(513); +var Cache = __webpack_require__(624); /** * Utils @@ -66589,7 +66679,7 @@ utils.createRegex = function(str) { /***/ }), -/* 640 */ +/* 641 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -66599,16 +66689,16 @@ utils.createRegex = function(str) { * Module dependencies */ -var Snapdragon = __webpack_require__(540); -var define = __webpack_require__(638); -var extend = __webpack_require__(510); +var Snapdragon = __webpack_require__(541); +var define = __webpack_require__(639); +var extend = __webpack_require__(511); /** * Local dependencies */ -var compilers = __webpack_require__(631); -var parsers = __webpack_require__(637); +var compilers = __webpack_require__(632); +var parsers = __webpack_require__(638); /** * Customize Snapdragon parser and renderer @@ -66674,16 +66764,16 @@ module.exports = Extglob; /***/ }), -/* 641 */ +/* 642 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var extglob = __webpack_require__(630); -var nanomatch = __webpack_require__(615); -var regexNot = __webpack_require__(512); -var toRegex = __webpack_require__(603); +var extglob = __webpack_require__(631); +var nanomatch = __webpack_require__(616); +var regexNot = __webpack_require__(513); +var toRegex = __webpack_require__(604); var not; /** @@ -66764,14 +66854,14 @@ function textRegex(pattern) { /***/ }), -/* 642 */ +/* 643 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = new (__webpack_require__(623))(); +module.exports = new (__webpack_require__(624))(); /***/ }), -/* 643 */ +/* 644 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -66784,13 +66874,13 @@ var path = __webpack_require__(16); * Module dependencies */ -var Snapdragon = __webpack_require__(540); -utils.define = __webpack_require__(610); -utils.diff = __webpack_require__(627); -utils.extend = __webpack_require__(611); -utils.pick = __webpack_require__(628); -utils.typeOf = __webpack_require__(644); -utils.unique = __webpack_require__(513); +var Snapdragon = __webpack_require__(541); +utils.define = __webpack_require__(611); +utils.diff = __webpack_require__(628); +utils.extend = __webpack_require__(612); +utils.pick = __webpack_require__(629); +utils.typeOf = __webpack_require__(645); +utils.unique = __webpack_require__(514); /** * Returns true if the platform is windows, or `path.sep` is `\\`. @@ -67087,7 +67177,7 @@ utils.unixify = function(options) { /***/ }), -/* 644 */ +/* 645 */ /***/ (function(module, exports) { var toString = Object.prototype.toString; @@ -67222,7 +67312,7 @@ function isBuffer(val) { /***/ }), -/* 645 */ +/* 646 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -67241,9 +67331,9 @@ var __extends = (this && this.__extends) || (function () { }; })(); Object.defineProperty(exports, "__esModule", { value: true }); -var readdir = __webpack_require__(646); -var reader_1 = __webpack_require__(659); -var fs_stream_1 = __webpack_require__(663); +var readdir = __webpack_require__(647); +var reader_1 = __webpack_require__(660); +var fs_stream_1 = __webpack_require__(664); var ReaderAsync = /** @class */ (function (_super) { __extends(ReaderAsync, _super); function ReaderAsync() { @@ -67304,15 +67394,15 @@ exports.default = ReaderAsync; /***/ }), -/* 646 */ +/* 647 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const readdirSync = __webpack_require__(647); -const readdirAsync = __webpack_require__(655); -const readdirStream = __webpack_require__(658); +const readdirSync = __webpack_require__(648); +const readdirAsync = __webpack_require__(656); +const readdirStream = __webpack_require__(659); module.exports = exports = readdirAsyncPath; exports.readdir = exports.readdirAsync = exports.async = readdirAsyncPath; @@ -67396,7 +67486,7 @@ function readdirStreamStat (dir, options) { /***/ }), -/* 647 */ +/* 648 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -67404,11 +67494,11 @@ function readdirStreamStat (dir, options) { module.exports = readdirSync; -const DirectoryReader = __webpack_require__(648); +const DirectoryReader = __webpack_require__(649); let syncFacade = { - fs: __webpack_require__(653), - forEach: __webpack_require__(654), + fs: __webpack_require__(654), + forEach: __webpack_require__(655), sync: true }; @@ -67437,7 +67527,7 @@ function readdirSync (dir, options, internalOptions) { /***/ }), -/* 648 */ +/* 649 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -67446,9 +67536,9 @@ function readdirSync (dir, options, internalOptions) { const Readable = __webpack_require__(28).Readable; const EventEmitter = __webpack_require__(46).EventEmitter; const path = __webpack_require__(16); -const normalizeOptions = __webpack_require__(649); -const stat = __webpack_require__(651); -const call = __webpack_require__(652); +const normalizeOptions = __webpack_require__(650); +const stat = __webpack_require__(652); +const call = __webpack_require__(653); /** * Asynchronously reads the contents of a directory and streams the results @@ -67824,14 +67914,14 @@ module.exports = DirectoryReader; /***/ }), -/* 649 */ +/* 650 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const path = __webpack_require__(16); -const globToRegExp = __webpack_require__(650); +const globToRegExp = __webpack_require__(651); module.exports = normalizeOptions; @@ -68008,7 +68098,7 @@ function normalizeOptions (options, internalOptions) { /***/ }), -/* 650 */ +/* 651 */ /***/ (function(module, exports) { module.exports = function (glob, opts) { @@ -68145,13 +68235,13 @@ module.exports = function (glob, opts) { /***/ }), -/* 651 */ +/* 652 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const call = __webpack_require__(652); +const call = __webpack_require__(653); module.exports = stat; @@ -68226,7 +68316,7 @@ function symlinkStat (fs, path, lstats, callback) { /***/ }), -/* 652 */ +/* 653 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -68287,14 +68377,14 @@ function callOnce (fn) { /***/ }), -/* 653 */ +/* 654 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const fs = __webpack_require__(23); -const call = __webpack_require__(652); +const call = __webpack_require__(653); /** * A facade around {@link fs.readdirSync} that allows it to be called @@ -68358,7 +68448,7 @@ exports.lstat = function (path, callback) { /***/ }), -/* 654 */ +/* 655 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -68387,7 +68477,7 @@ function syncForEach (array, iterator, done) { /***/ }), -/* 655 */ +/* 656 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -68395,12 +68485,12 @@ function syncForEach (array, iterator, done) { module.exports = readdirAsync; -const maybe = __webpack_require__(656); -const DirectoryReader = __webpack_require__(648); +const maybe = __webpack_require__(657); +const DirectoryReader = __webpack_require__(649); let asyncFacade = { fs: __webpack_require__(23), - forEach: __webpack_require__(657), + forEach: __webpack_require__(658), async: true }; @@ -68442,7 +68532,7 @@ function readdirAsync (dir, options, callback, internalOptions) { /***/ }), -/* 656 */ +/* 657 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -68469,7 +68559,7 @@ module.exports = function maybe (cb, promise) { /***/ }), -/* 657 */ +/* 658 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -68505,7 +68595,7 @@ function asyncForEach (array, iterator, done) { /***/ }), -/* 658 */ +/* 659 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -68513,11 +68603,11 @@ function asyncForEach (array, iterator, done) { module.exports = readdirStream; -const DirectoryReader = __webpack_require__(648); +const DirectoryReader = __webpack_require__(649); let streamFacade = { fs: __webpack_require__(23), - forEach: __webpack_require__(657), + forEach: __webpack_require__(658), async: true }; @@ -68537,16 +68627,16 @@ function readdirStream (dir, options, internalOptions) { /***/ }), -/* 659 */ +/* 660 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var path = __webpack_require__(16); -var deep_1 = __webpack_require__(660); -var entry_1 = __webpack_require__(662); -var pathUtil = __webpack_require__(661); +var deep_1 = __webpack_require__(661); +var entry_1 = __webpack_require__(663); +var pathUtil = __webpack_require__(662); var Reader = /** @class */ (function () { function Reader(options) { this.options = options; @@ -68612,14 +68702,14 @@ exports.default = Reader; /***/ }), -/* 660 */ +/* 661 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var pathUtils = __webpack_require__(661); -var patternUtils = __webpack_require__(494); +var pathUtils = __webpack_require__(662); +var patternUtils = __webpack_require__(495); var DeepFilter = /** @class */ (function () { function DeepFilter(options, micromatchOptions) { this.options = options; @@ -68702,7 +68792,7 @@ exports.default = DeepFilter; /***/ }), -/* 661 */ +/* 662 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -68733,14 +68823,14 @@ exports.makeAbsolute = makeAbsolute; /***/ }), -/* 662 */ +/* 663 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var pathUtils = __webpack_require__(661); -var patternUtils = __webpack_require__(494); +var pathUtils = __webpack_require__(662); +var patternUtils = __webpack_require__(495); var EntryFilter = /** @class */ (function () { function EntryFilter(options, micromatchOptions) { this.options = options; @@ -68825,7 +68915,7 @@ exports.default = EntryFilter; /***/ }), -/* 663 */ +/* 664 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -68845,8 +68935,8 @@ var __extends = (this && this.__extends) || (function () { })(); Object.defineProperty(exports, "__esModule", { value: true }); var stream = __webpack_require__(28); -var fsStat = __webpack_require__(664); -var fs_1 = __webpack_require__(668); +var fsStat = __webpack_require__(665); +var fs_1 = __webpack_require__(669); var FileSystemStream = /** @class */ (function (_super) { __extends(FileSystemStream, _super); function FileSystemStream() { @@ -68896,14 +68986,14 @@ exports.default = FileSystemStream; /***/ }), -/* 664 */ +/* 665 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const optionsManager = __webpack_require__(665); -const statProvider = __webpack_require__(667); +const optionsManager = __webpack_require__(666); +const statProvider = __webpack_require__(668); /** * Asynchronous API. */ @@ -68934,13 +69024,13 @@ exports.statSync = statSync; /***/ }), -/* 665 */ +/* 666 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const fsAdapter = __webpack_require__(666); +const fsAdapter = __webpack_require__(667); function prepare(opts) { const options = Object.assign({ fs: fsAdapter.getFileSystemAdapter(opts ? opts.fs : undefined), @@ -68953,7 +69043,7 @@ exports.prepare = prepare; /***/ }), -/* 666 */ +/* 667 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -68976,7 +69066,7 @@ exports.getFileSystemAdapter = getFileSystemAdapter; /***/ }), -/* 667 */ +/* 668 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -69028,7 +69118,7 @@ exports.isFollowedSymlink = isFollowedSymlink; /***/ }), -/* 668 */ +/* 669 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -69059,7 +69149,7 @@ exports.default = FileSystem; /***/ }), -/* 669 */ +/* 670 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -69079,9 +69169,9 @@ var __extends = (this && this.__extends) || (function () { })(); Object.defineProperty(exports, "__esModule", { value: true }); var stream = __webpack_require__(28); -var readdir = __webpack_require__(646); -var reader_1 = __webpack_require__(659); -var fs_stream_1 = __webpack_require__(663); +var readdir = __webpack_require__(647); +var reader_1 = __webpack_require__(660); +var fs_stream_1 = __webpack_require__(664); var TransformStream = /** @class */ (function (_super) { __extends(TransformStream, _super); function TransformStream(reader) { @@ -69149,7 +69239,7 @@ exports.default = ReaderStream; /***/ }), -/* 670 */ +/* 671 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -69168,9 +69258,9 @@ var __extends = (this && this.__extends) || (function () { }; })(); Object.defineProperty(exports, "__esModule", { value: true }); -var readdir = __webpack_require__(646); -var reader_1 = __webpack_require__(659); -var fs_sync_1 = __webpack_require__(671); +var readdir = __webpack_require__(647); +var reader_1 = __webpack_require__(660); +var fs_sync_1 = __webpack_require__(672); var ReaderSync = /** @class */ (function (_super) { __extends(ReaderSync, _super); function ReaderSync() { @@ -69230,7 +69320,7 @@ exports.default = ReaderSync; /***/ }), -/* 671 */ +/* 672 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -69249,8 +69339,8 @@ var __extends = (this && this.__extends) || (function () { }; })(); Object.defineProperty(exports, "__esModule", { value: true }); -var fsStat = __webpack_require__(664); -var fs_1 = __webpack_require__(668); +var fsStat = __webpack_require__(665); +var fs_1 = __webpack_require__(669); var FileSystemSync = /** @class */ (function (_super) { __extends(FileSystemSync, _super); function FileSystemSync() { @@ -69296,7 +69386,7 @@ exports.default = FileSystemSync; /***/ }), -/* 672 */ +/* 673 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -69312,7 +69402,7 @@ exports.flatten = flatten; /***/ }), -/* 673 */ +/* 674 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -69333,13 +69423,13 @@ exports.merge = merge; /***/ }), -/* 674 */ +/* 675 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const path = __webpack_require__(16); -const pathType = __webpack_require__(675); +const pathType = __webpack_require__(676); const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0]; @@ -69405,13 +69495,13 @@ module.exports.sync = (input, opts) => { /***/ }), -/* 675 */ +/* 676 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const fs = __webpack_require__(23); -const pify = __webpack_require__(676); +const pify = __webpack_require__(677); function type(fn, fn2, fp) { if (typeof fp !== 'string') { @@ -69454,7 +69544,7 @@ exports.symlinkSync = typeSync.bind(null, 'lstatSync', 'isSymbolicLink'); /***/ }), -/* 676 */ +/* 677 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -69545,17 +69635,17 @@ module.exports = (obj, opts) => { /***/ }), -/* 677 */ +/* 678 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const fs = __webpack_require__(23); const path = __webpack_require__(16); -const fastGlob = __webpack_require__(490); -const gitIgnore = __webpack_require__(678); -const pify = __webpack_require__(679); -const slash = __webpack_require__(680); +const fastGlob = __webpack_require__(491); +const gitIgnore = __webpack_require__(679); +const pify = __webpack_require__(680); +const slash = __webpack_require__(681); const DEFAULT_IGNORE = [ '**/node_modules/**', @@ -69653,7 +69743,7 @@ module.exports.sync = options => { /***/ }), -/* 678 */ +/* 679 */ /***/ (function(module, exports) { // A simple implementation of make-array @@ -70122,7 +70212,7 @@ module.exports = options => new IgnoreBase(options) /***/ }), -/* 679 */ +/* 680 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -70197,7 +70287,7 @@ module.exports = (input, options) => { /***/ }), -/* 680 */ +/* 681 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -70215,17 +70305,17 @@ module.exports = input => { /***/ }), -/* 681 */ +/* 682 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const path = __webpack_require__(16); const {constants: fsConstants} = __webpack_require__(23); -const {Buffer} = __webpack_require__(682); -const CpFileError = __webpack_require__(684); -const fs = __webpack_require__(686); -const ProgressEmitter = __webpack_require__(688); +const {Buffer} = __webpack_require__(683); +const CpFileError = __webpack_require__(685); +const fs = __webpack_require__(687); +const ProgressEmitter = __webpack_require__(689); const cpFile = (source, destination, options) => { if (!source || !destination) { @@ -70379,11 +70469,11 @@ module.exports.sync = (source, destination, options) => { /***/ }), -/* 682 */ +/* 683 */ /***/ (function(module, exports, __webpack_require__) { /* eslint-disable node/no-deprecated-api */ -var buffer = __webpack_require__(683) +var buffer = __webpack_require__(684) var Buffer = buffer.Buffer // alternative to using Object.keys for old browsers @@ -70447,18 +70537,18 @@ SafeBuffer.allocUnsafeSlow = function (size) { /***/ }), -/* 683 */ +/* 684 */ /***/ (function(module, exports) { module.exports = require("buffer"); /***/ }), -/* 684 */ +/* 685 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const NestedError = __webpack_require__(685); +const NestedError = __webpack_require__(686); class CpFileError extends NestedError { constructor(message, nested) { @@ -70472,7 +70562,7 @@ module.exports = CpFileError; /***/ }), -/* 685 */ +/* 686 */ /***/ (function(module, exports, __webpack_require__) { var inherits = __webpack_require__(44); @@ -70526,15 +70616,15 @@ module.exports = NestedError; /***/ }), -/* 686 */ +/* 687 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const fs = __webpack_require__(22); const makeDir = __webpack_require__(115); -const pify = __webpack_require__(687); -const CpFileError = __webpack_require__(684); +const pify = __webpack_require__(688); +const CpFileError = __webpack_require__(685); const fsP = pify(fs); @@ -70679,7 +70769,7 @@ if (fs.copyFileSync) { /***/ }), -/* 687 */ +/* 688 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -70754,7 +70844,7 @@ module.exports = (input, options) => { /***/ }), -/* 688 */ +/* 689 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -70795,12 +70885,12 @@ module.exports = ProgressEmitter; /***/ }), -/* 689 */ +/* 690 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const NestedError = __webpack_require__(690); +const NestedError = __webpack_require__(691); class CpyError extends NestedError { constructor(message, nested) { @@ -70814,7 +70904,7 @@ module.exports = CpyError; /***/ }), -/* 690 */ +/* 691 */ /***/ (function(module, exports, __webpack_require__) { var inherits = __webpack_require__(29).inherits; @@ -70870,7 +70960,7 @@ module.exports = NestedError; /***/ }), -/* 691 */ +/* 692 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; diff --git a/packages/kbn-pm/package.json b/packages/kbn-pm/package.json index dafe73ec7d1d6..34a56615ed43a 100644 --- a/packages/kbn-pm/package.json +++ b/packages/kbn-pm/package.json @@ -52,7 +52,7 @@ "ora": "^1.4.0", "prettier": "^1.18.2", "read-pkg": "^5.2.0", - "rxjs": "^6.2.1", + "rxjs": "^6.5.3", "spawn-sync": "^1.0.15", "string-replace-loader": "^2.2.0", "strip-ansi": "^4.0.0", diff --git a/packages/kbn-test/package.json b/packages/kbn-test/package.json index 113783f66bc59..8c5358c82208d 100644 --- a/packages/kbn-test/package.json +++ b/packages/kbn-test/package.json @@ -25,7 +25,7 @@ "glob": "^7.1.2", "parse-link-header": "^1.0.1", "strip-ansi": "^5.2.0", - "rxjs": "^6.2.1", + "rxjs": "^6.5.3", "tar-fs": "^1.16.3", "tmp": "^0.1.0", "xml2js": "^0.4.22", diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx index bc723de06f215..3ddbe420ba284 100644 --- a/src/core/public/chrome/ui/header/header.tsx +++ b/src/core/public/chrome/ui/header/header.tsx @@ -171,7 +171,7 @@ interface Props { navLinks$: Rx.Observable; recentlyAccessed$: Rx.Observable; forceAppSwitcherNavigation$: Rx.Observable; - helpExtension$: Rx.Observable; + helpExtension$: Rx.Observable; legacyMode: boolean; navControlsLeft$: Rx.Observable; navControlsRight$: Rx.Observable; diff --git a/src/core/public/chrome/ui/header/header_help_menu.tsx b/src/core/public/chrome/ui/header/header_help_menu.tsx index e2146f8d65bba..688d76c9d75d9 100644 --- a/src/core/public/chrome/ui/header/header_help_menu.tsx +++ b/src/core/public/chrome/ui/header/header_help_menu.tsx @@ -43,7 +43,7 @@ import { HeaderExtension } from './header_extension'; import { ChromeHelpExtension } from '../../chrome_service'; interface Props { - helpExtension$: Rx.Observable; + helpExtension$: Rx.Observable; intl: InjectedIntl; kibanaVersion: string; useDefaultContent?: boolean; diff --git a/src/core/public/rendering/rendering_service.test.tsx b/src/core/public/rendering/rendering_service.test.tsx index 317ab5cc8b855..ed835574a32f9 100644 --- a/src/core/public/rendering/rendering_service.test.tsx +++ b/src/core/public/rendering/rendering_service.test.tsx @@ -34,7 +34,7 @@ describe('RenderingService#start', () => { const chrome = chromeServiceMock.createStartContract(); chrome.getHeaderComponent.mockReturnValue(
Hello chrome!
); const overlays = overlayServiceMock.createStartContract(); - overlays.banners.getComponent.mockReturnValue(
I'm a banner!
); + overlays.banners.getComponent.mockReturnValue(
I'm a banner!
); const injectedMetadata = injectedMetadataServiceMock.createStartContract(); injectedMetadata.getLegacyMode.mockReturnValue(legacyMode); diff --git a/src/core/server/elasticsearch/elasticsearch_config.test.ts b/src/core/server/elasticsearch/elasticsearch_config.test.ts index 1a6a8929cd6a0..383ba77f17779 100644 --- a/src/core/server/elasticsearch/elasticsearch_config.test.ts +++ b/src/core/server/elasticsearch/elasticsearch_config.test.ts @@ -22,32 +22,33 @@ import { ElasticsearchConfig, config } from './elasticsearch_config'; test('set correct defaults', () => { const configValue = new ElasticsearchConfig(config.schema.validate({})); expect(configValue).toMatchInlineSnapshot(` -ElasticsearchConfig { - "apiVersion": "master", - "customHeaders": Object {}, - "healthCheckDelay": "PT2.5S", - "hosts": Array [ - "http://localhost:9200", - ], - "logQueries": false, - "password": undefined, - "pingTimeout": "PT30S", - "requestHeadersWhitelist": Array [ - "authorization", - ], - "requestTimeout": "PT30S", - "shardTimeout": "PT30S", - "sniffInterval": false, - "sniffOnConnectionFault": false, - "sniffOnStart": false, - "ssl": Object { - "alwaysPresentCertificate": true, - "certificateAuthorities": undefined, - "verificationMode": "full", - }, - "username": undefined, -} -`); + ElasticsearchConfig { + "apiVersion": "master", + "customHeaders": Object {}, + "healthCheckDelay": "PT2.5S", + "hosts": Array [ + "http://localhost:9200", + ], + "ignoreVersionMismatch": false, + "logQueries": false, + "password": undefined, + "pingTimeout": "PT30S", + "requestHeadersWhitelist": Array [ + "authorization", + ], + "requestTimeout": "PT30S", + "shardTimeout": "PT30S", + "sniffInterval": false, + "sniffOnConnectionFault": false, + "sniffOnStart": false, + "ssl": Object { + "alwaysPresentCertificate": true, + "certificateAuthorities": undefined, + "verificationMode": "full", + }, + "username": undefined, + } + `); }); test('#hosts accepts both string and array of strings', () => { diff --git a/src/core/server/elasticsearch/elasticsearch_config.ts b/src/core/server/elasticsearch/elasticsearch_config.ts index fb585a8d67262..947a0d27546b1 100644 --- a/src/core/server/elasticsearch/elasticsearch_config.ts +++ b/src/core/server/elasticsearch/elasticsearch_config.ts @@ -65,6 +65,7 @@ export const config = { }), apiVersion: schema.string({ defaultValue: DEFAULT_API_VERSION }), healthCheck: schema.object({ delay: schema.duration({ defaultValue: 2500 }) }), + ignoreVersionMismatch: schema.boolean({ defaultValue: false }), }), }; @@ -74,6 +75,11 @@ export class ElasticsearchConfig { */ public readonly healthCheckDelay: Duration; + /** + * Whether to allow kibana to connect to a non-compatible elasticsearch node. + */ + public readonly ignoreVersionMismatch: boolean; + /** * Version of the Elasticsearch (6.7, 7.1 or `master`) client will be connecting to. */ @@ -161,6 +167,7 @@ export class ElasticsearchConfig { public readonly customHeaders: ElasticsearchConfigType['customHeaders']; constructor(rawConfig: ElasticsearchConfigType) { + this.ignoreVersionMismatch = rawConfig.ignoreVersionMismatch; this.apiVersion = rawConfig.apiVersion; this.logQueries = rawConfig.logQueries; this.hosts = Array.isArray(rawConfig.hosts) ? rawConfig.hosts : [rawConfig.hosts]; diff --git a/src/core/server/http/http_server.test.ts b/src/core/server/http/http_server.test.ts index f61371c5437e6..acae9d8ff0e70 100644 --- a/src/core/server/http/http_server.test.ts +++ b/src/core/server/http/http_server.test.ts @@ -577,45 +577,6 @@ test('exposes route details of incoming request to a route handler', async () => }); }); -describe('conditional compression', () => { - test('disables compression when there is a referer', async () => { - const { registerRouter, server: innerServer } = await server.setup(config); - - const router = new Router('', logger, enhanceWithContext); - router.get({ path: '/', validate: false }, (context, req, res) => - // we need the large body here so that compression would normally be used - res.ok({ body: 'hello'.repeat(500), headers: { 'Content-Type': 'text/html; charset=UTF-8' } }) - ); - registerRouter(router); - - await server.start(); - const response = await supertest(innerServer.listener) - .get('/') - .set('accept-encoding', 'gzip') - .set('referer', 'http://some-other-site/'); - - expect(response.header).not.toHaveProperty('content-encoding'); - }); - - test(`enables compression when there isn't a referer`, async () => { - const { registerRouter, server: innerServer } = await server.setup(config); - - const router = new Router('', logger, enhanceWithContext); - router.get({ path: '/', validate: false }, (context, req, res) => - // we need the large body here so that compression will be used - res.ok({ body: 'hello'.repeat(500), headers: { 'Content-Type': 'text/html; charset=UTF-8' } }) - ); - registerRouter(router); - - await server.start(); - const response = await supertest(innerServer.listener) - .get('/') - .set('accept-encoding', 'gzip'); - - expect(response.header).toHaveProperty('content-encoding', 'gzip'); - }); -}); - describe('setup contract', () => { describe('#createSessionStorage', () => { it('creates session storage factory', async () => { diff --git a/src/core/server/http/http_server.ts b/src/core/server/http/http_server.ts index d6077200d3c75..3354324c12407 100644 --- a/src/core/server/http/http_server.ts +++ b/src/core/server/http/http_server.ts @@ -96,7 +96,6 @@ export class HttpServer { const basePathService = new BasePath(config.basePath); this.setupBasePathRewrite(config, basePathService); - this.setupConditionalCompression(); return { registerRouter: this.registerRouter.bind(this), @@ -176,23 +175,6 @@ export class HttpServer { }); } - private setupConditionalCompression() { - if (this.server === undefined) { - throw new Error('Server is not created yet'); - } - - this.server.ext('onRequest', (request, h) => { - // whenever there is a referrer, don't use compression even if the client supports it - if (request.info.referrer !== '') { - this.log.debug( - `Not using compression because there is a referer: ${request.info.referrer}` - ); - request.info.acceptEncoding = ''; - } - return h.continue; - }); - } - private registerOnPostAuth(fn: OnPostAuthHandler) { if (this.server === undefined) { throw new Error('Server is not created yet'); diff --git a/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts b/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts index f1f4da8d0b4d7..c0a6026708af3 100644 --- a/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts +++ b/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts @@ -54,7 +54,7 @@ export async function findLegacyPluginSpecs(settings: unknown, loggerFactory: Lo invalidDirectoryError$: Observable<{ path: string }>; invalidPackError$: Observable<{ path: string }>; otherError$: Observable; - deprecation$: Observable; + deprecation$: Observable<{ spec: LegacyPluginSpec; message: string }>; invalidVersionSpec$: Observable; spec$: Observable; disabledSpec$: Observable; diff --git a/src/core/server/plugins/discovery/plugins_discovery.ts b/src/core/server/plugins/discovery/plugins_discovery.ts index 74e9dd709bb23..521d02e487df6 100644 --- a/src/core/server/plugins/discovery/plugins_discovery.ts +++ b/src/core/server/plugins/discovery/plugins_discovery.ts @@ -29,7 +29,7 @@ import { PluginsConfig } from '../plugins_config'; import { PluginDiscoveryError } from './plugin_discovery_error'; import { parseManifest } from './plugin_manifest_parser'; -const fsReadDir$ = bindNodeCallback(readdir); +const fsReadDir$ = bindNodeCallback(readdir); const fsStat$ = bindNodeCallback(stat); /** diff --git a/src/core/server/saved_objects/service/lib/repository.test.js b/src/core/server/saved_objects/service/lib/repository.test.js index 9941bbd03f5dc..6525590ee96c5 100644 --- a/src/core/server/saved_objects/service/lib/repository.test.js +++ b/src/core/server/saved_objects/service/lib/repository.test.js @@ -1377,7 +1377,7 @@ describe('SavedObjectsRepository', () => { }; await expect(savedObjectsRepository.find(findOpts)).rejects.toMatchInlineSnapshot(` - [Error: KQLSyntaxError: Expected "(", value, whitespace but "<" found. + [Error: KQLSyntaxError: Expected "(", "{", value, whitespace but "<" found. dashboard.attributes.otherField:< --------------------------------^: Bad Request] `); diff --git a/src/dev/build/build_distributables.js b/src/dev/build/build_distributables.js index e3fcfd9536c47..eeffc2380f38b 100644 --- a/src/dev/build/build_distributables.js +++ b/src/dev/build/build_distributables.js @@ -45,7 +45,6 @@ import { ExtractNodeBuildsTask, InstallDependenciesTask, OptimizeBuildTask, - PatchNativeModulesTask, RemovePackageJsonDepsTask, RemoveWorkspacesTask, TranspileBabelTask, @@ -131,7 +130,6 @@ export async function buildDistributables(options) { * directories and perform platform-specific steps */ await run(CreateArchivesSourcesTask); - await run(PatchNativeModulesTask); await run(CleanExtraBinScriptsTask); await run(CleanExtraBrowsersTask); await run(CleanNodeBuildsTask); diff --git a/src/dev/build/lib/scan_delete.ts b/src/dev/build/lib/scan_delete.ts index f1b2a02c11a43..cb4e64ce1b5f9 100644 --- a/src/dev/build/lib/scan_delete.ts +++ b/src/dev/build/lib/scan_delete.ts @@ -28,7 +28,7 @@ import { count, map, mergeAll, mergeMap } from 'rxjs/operators'; import { assertAbsolute } from './fs'; const getStat$ = Rx.bindNodeCallback(Fs.stat); -const getReadDir$ = Rx.bindNodeCallback(Fs.readdir); +const getReadDir$ = Rx.bindNodeCallback(Fs.readdir); interface Options { directory: string; diff --git a/src/dev/build/tasks/index.js b/src/dev/build/tasks/index.js index 35c07c9187317..014cdc7ad5ea7 100644 --- a/src/dev/build/tasks/index.js +++ b/src/dev/build/tasks/index.js @@ -36,5 +36,4 @@ export * from './transpile_babel_task'; export * from './transpile_scss_task'; export * from './verify_env_task'; export * from './write_sha_sums_task'; -export * from './patch_native_modules_task'; export * from './path_length_task'; diff --git a/src/dev/build/tasks/patch_native_modules_task.js b/src/dev/build/tasks/patch_native_modules_task.js deleted file mode 100644 index 16290aca04e73..0000000000000 --- a/src/dev/build/tasks/patch_native_modules_task.js +++ /dev/null @@ -1,47 +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 install from '@elastic/simple-git/scripts/install'; -import { deleteAll } from '../lib'; -import path from 'path'; - -async function patchGit(config, log, build, platform) { - const downloadPath = build.resolvePathForPlatform(platform, '.git_binaries', 'git.tar.gz'); - const destination = build.resolvePathForPlatform( - platform, - 'node_modules/@elastic/simple-git/native/git' - ); - log.debug('Replacing git binaries from ' + downloadPath + ' to ' + destination); - const p = platform.isWindows() ? 'win32' : platform.getName(); - await deleteAll([destination]); - await install(p, downloadPath, destination); - await deleteAll([path.dirname(downloadPath)], log); -} - -export const PatchNativeModulesTask = { - description: 'Patching platform-specific native modules directories', - async run(config, log, build) { - await Promise.all( - config.getTargetPlatforms().map(async platform => { - if (!build.isOss()) { - await patchGit(config, log, build, platform); - } - }) - ); - }, -}; diff --git a/src/fixtures/logstash_fields.js b/src/fixtures/logstash_fields.js index 8299604d3a28c..ab96b69851b71 100644 --- a/src/fixtures/logstash_fields.js +++ b/src/fixtures/logstash_fields.js @@ -19,13 +19,13 @@ import { castEsToKbnFieldTypeName } from '../plugins/data/common'; // eslint-disable-next-line max-len -import { shouldReadFieldFromDocValues } from '../legacy/server/index_patterns/service/lib/field_capabilities/should_read_field_from_doc_values'; +import { shouldReadFieldFromDocValues } from '../plugins/data/server'; function stubbedLogstashFields() { return [ // |aggregatable // | |searchable - // name esType | | |metadata | parent | subType + // name esType | | |metadata | subType ['bytes', 'long', true, true, { count: 10 } ], ['ssl', 'boolean', true, true, { count: 20 } ], ['@timestamp', 'date', true, true, { count: 30 } ], @@ -40,9 +40,9 @@ function stubbedLogstashFields() { ['hashed', 'murmur3', false, true ], ['geo.coordinates', 'geo_point', true, true ], ['extension', 'text', true, true], - ['extension.keyword', 'keyword', true, true, {}, 'extension', 'multi' ], + ['extension.keyword', 'keyword', true, true, {}, { multi: { parent: 'extension' } } ], ['machine.os', 'text', true, true ], - ['machine.os.raw', 'keyword', true, true, {}, 'machine.os', 'multi' ], + ['machine.os.raw', 'keyword', true, true, {}, { multi: { parent: 'machine.os' } } ], ['geo.src', 'keyword', true, true ], ['_id', '_id', true, true ], ['_type', '_type', true, true ], @@ -61,7 +61,6 @@ function stubbedLogstashFields() { aggregatable, searchable, metadata = {}, - parent = undefined, subType = undefined, ] = row; @@ -87,7 +86,6 @@ function stubbedLogstashFields() { script, lang, scripted, - parent, subType, }; }); diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/index.ts b/src/legacy/core_plugins/dashboard_embeddable_container/index.ts index 74682722e9b89..714203de20385 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/index.ts +++ b/src/legacy/core_plugins/dashboard_embeddable_container/index.ts @@ -23,7 +23,6 @@ import { resolve } from 'path'; export default function(kibana: any) { return new kibana.Plugin({ uiExports: { - hacks: ['plugins/dashboard_embeddable_container/initialize'], styleSheetPaths: resolve(__dirname, 'public/index.scss'), }, }); diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/index.scss b/src/legacy/core_plugins/dashboard_embeddable_container/public/index.scss index 88e570d137893..548e85746f866 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/index.scss +++ b/src/legacy/core_plugins/dashboard_embeddable_container/public/index.scss @@ -1,6 +1,3 @@ @import 'src/legacy/ui/public/styles/styling_constants'; -@import 'src/legacy/core_plugins/embeddable_api/public/variables'; -@import './np_ready/public/lib/embeddable/grid/index'; -@import './np_ready/public/lib/embeddable/panel/index'; -@import './np_ready/public/lib/embeddable/viewport/index'; +@import '../../../../plugins/dashboard_embeddable_container/public/index'; diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/initialize.ts b/src/legacy/core_plugins/dashboard_embeddable_container/public/initialize.ts index a4bc3cf17026c..9880b336e76e5 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/initialize.ts +++ b/src/legacy/core_plugins/dashboard_embeddable_container/public/initialize.ts @@ -16,5 +16,3 @@ * specific language governing permissions and limitations * under the License. */ - -import './np_ready/public/legacy'; diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/index.ts b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/index.ts index 1dad1b488590e..d8c0de2bce3f4 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/index.ts +++ b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/index.ts @@ -17,13 +17,4 @@ * under the License. */ -import { PluginInitializerContext } from '../../../../../../core/public'; -import { DashboardEmbeddableContainerPublicPlugin } from './plugin'; - -export * from './lib'; - -export function plugin(initializerContext: PluginInitializerContext) { - return new DashboardEmbeddableContainerPublicPlugin(initializerContext); -} - -export { DashboardEmbeddableContainerPublicPlugin as Plugin }; +export * from '../../../../../../plugins/dashboard_embeddable_container/public'; diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/legacy.ts b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/legacy.ts index ccb04d8c2e027..9880b336e76e5 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/legacy.ts +++ b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/legacy.ts @@ -16,32 +16,3 @@ * specific language governing permissions and limitations * under the License. */ - -/* eslint-disable @kbn/eslint/no-restricted-paths */ -import { npSetup, npStart } from 'ui/new_platform'; -import { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder'; -import { ExitFullScreenButton } from 'ui/exit_full_screen'; -/* eslint-enable @kbn/eslint/no-restricted-paths */ - -import { plugin } from '.'; -import { - setup as embeddableSetup, - start as embeddableStart, -} from '../../../../embeddable_api/public/np_ready/public/legacy'; - -const pluginInstance = plugin({} as any); - -export const setup = pluginInstance.setup(npSetup.core, { - embeddable: embeddableSetup, - uiActions: npSetup.plugins.uiActions, -}); - -export const start = pluginInstance.start(npStart.core, { - embeddable: embeddableStart, - inspector: npStart.plugins.inspector, - __LEGACY: { - SavedObjectFinder, - ExitFullScreenButton, - }, - uiActions: npStart.plugins.uiActions, -}); diff --git a/src/legacy/core_plugins/data/public/filter/action/apply_filter_action.ts b/src/legacy/core_plugins/data/public/filter/action/apply_filter_action.ts index c436e1d45c6d8..8d2337264d02f 100644 --- a/src/legacy/core_plugins/data/public/filter/action/apply_filter_action.ts +++ b/src/legacy/core_plugins/data/public/filter/action/apply_filter_action.ts @@ -18,21 +18,20 @@ */ import { i18n } from '@kbn/i18n'; -import { Filter } from '@kbn/es-query'; -import { npStart } from 'ui/new_platform'; +import { CoreStart } from 'src/core/public'; import { IAction, createAction, IncompatibleActionError, } from '../../../../../../plugins/ui_actions/public'; -import { changeTimeFilter, extractTimeFilter, FilterManager } from '../filter_manager'; -import { TimefilterContract } from '../../timefilter'; +import { FilterManager, esFilters } from '../../../../../../plugins/data/public'; +import { TimefilterContract, changeTimeFilter, extractTimeFilter } from '../../timefilter'; import { applyFiltersPopover } from '../apply_filters/apply_filters_popover'; import { IndexPatternsStart } from '../../index_patterns'; export const GLOBAL_APPLY_FILTER_ACTION = 'GLOBAL_APPLY_FILTER_ACTION'; interface ActionContext { - filters: Filter[]; + filters: esFilters.Filter[]; timeFieldName?: string; } @@ -41,6 +40,7 @@ async function isCompatible(context: ActionContext) { } export function createFilterAction( + overlays: CoreStart['overlays'], filterManager: FilterManager, timeFilter: TimefilterContract, indexPatternsService: IndexPatternsStart @@ -63,7 +63,7 @@ export function createFilterAction( throw new IncompatibleActionError(); } - let selectedFilters: Filter[] = filters; + let selectedFilters: esFilters.Filter[] = filters; if (selectedFilters.length > 1) { const indexPatterns = await Promise.all( @@ -72,8 +72,8 @@ export function createFilterAction( }) ); - const filterSelectionPromise: Promise = new Promise(resolve => { - const overlay = npStart.core.overlays.openModal( + const filterSelectionPromise: Promise = new Promise(resolve => { + const overlay = overlays.openModal( applyFiltersPopover( filters, indexPatterns, @@ -81,7 +81,7 @@ export function createFilterAction( overlay.close(); resolve([]); }, - (filterSelection: Filter[]) => { + (filterSelection: esFilters.Filter[]) => { overlay.close(); resolve(filterSelection); } diff --git a/src/legacy/core_plugins/data/public/filter/apply_filters/apply_filter_popover_content.tsx b/src/legacy/core_plugins/data/public/filter/apply_filters/apply_filter_popover_content.tsx index 5f7fbc1996433..e9d05d6340e58 100644 --- a/src/legacy/core_plugins/data/public/filter/apply_filters/apply_filter_popover_content.tsx +++ b/src/legacy/core_plugins/data/public/filter/apply_filters/apply_filter_popover_content.tsx @@ -28,19 +28,18 @@ import { EuiModalHeaderTitle, EuiSwitch, } from '@elastic/eui'; -import { Filter } from '@kbn/es-query'; import { FormattedMessage } from '@kbn/i18n/react'; import React, { Component } from 'react'; import { IndexPattern } from '../../index_patterns'; import { getFilterDisplayText } from '../filter_bar/filter_editor/lib/get_filter_display_text'; -import { mapAndFlattenFilters } from '../filter_manager/lib/map_and_flatten_filters'; +import { mapAndFlattenFilters, esFilters } from '../../../../../../plugins/data/public'; import { getDisplayValueFromFilter } from '../filter_bar/filter_editor/lib/get_display_value'; interface Props { - filters: Filter[]; + filters: esFilters.Filter[]; indexPatterns: IndexPattern[]; onCancel: () => void; - onSubmit: (filters: Filter[]) => void; + onSubmit: (filters: esFilters.Filter[]) => void; } interface State { @@ -58,7 +57,7 @@ export class ApplyFiltersPopoverContent extends Component { isFilterSelected: props.filters.map(() => true), }; } - private getLabel(filter: Filter) { + private getLabel(filter: esFilters.Filter) { const filterDisplayValue = getDisplayValueFromFilter(filter, this.props.indexPatterns); return getFilterDisplayText(filter, filterDisplayValue); } diff --git a/src/legacy/core_plugins/data/public/filter/apply_filters/apply_filters_popover.tsx b/src/legacy/core_plugins/data/public/filter/apply_filters/apply_filters_popover.tsx index 0687701429866..41f757e726c40 100644 --- a/src/legacy/core_plugins/data/public/filter/apply_filters/apply_filters_popover.tsx +++ b/src/legacy/core_plugins/data/public/filter/apply_filters/apply_filters_popover.tsx @@ -18,15 +18,15 @@ */ import { EuiModal, EuiOverlayMask } from '@elastic/eui'; -import { Filter } from '@kbn/es-query'; import React, { Component } from 'react'; import { ApplyFiltersPopoverContent } from './apply_filter_popover_content'; import { IndexPattern } from '../../index_patterns/index_patterns'; +import { esFilters } from '../../../../../../plugins/data/public'; interface Props { - filters: Filter[]; + filters: esFilters.Filter[]; onCancel: () => void; - onSubmit: (filters: Filter[]) => void; + onSubmit: (filters: esFilters.Filter[]) => void; indexPatterns: IndexPattern[]; } @@ -56,9 +56,9 @@ export class ApplyFiltersPopover extends Component { } type cancelFunction = () => void; -type submitFunction = (filters: Filter[]) => void; +type submitFunction = (filters: esFilters.Filter[]) => void; export const applyFiltersPopover = ( - filters: Filter[], + filters: esFilters.Filter[], indexPatterns: IndexPattern[], onCancel: cancelFunction, onSubmit: submitFunction diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/_global_filter_group.scss b/src/legacy/core_plugins/data/public/filter/filter_bar/_global_filter_group.scss index 3c90e18aecd5d..1c47c28097454 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_bar/_global_filter_group.scss +++ b/src/legacy/core_plugins/data/public/filter/filter_bar/_global_filter_group.scss @@ -11,6 +11,10 @@ margin-top: $euiSizeXS; } +.globalFilterBar__addButton { + min-height: $euiSizeL + $euiSizeXS; // same height as the badges +} + // sass-lint:disable quotes .globalFilterGroup__branch { padding: $euiSizeS $euiSizeM 0 0; @@ -40,4 +44,3 @@ margin-top: $euiSize * -1; } } - diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/_global_filter_item.scss b/src/legacy/core_plugins/data/public/filter/filter_bar/_global_filter_item.scss index caf3b0b796b9e..84538a62ca005 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_bar/_global_filter_item.scss +++ b/src/legacy/core_plugins/data/public/filter/filter_bar/_global_filter_item.scss @@ -1,5 +1,5 @@ -@import '@elastic/eui/src/components/form/mixins'; @import '@elastic/eui/src/components/form/variables'; +@import '@elastic/eui/src/components/form/mixins'; /** * 1. Allow wrapping of long filter items @@ -19,11 +19,17 @@ &:not(.globalFilterItem-isDisabled) { @include euiFormControlDefaultShadow; + box-shadow: #{$euiFormControlBoxShadow}, inset 0 0 0 1px $kbnGlobalFilterItemBorderColor; // Make the actual border more visible + } + + &:focus-within { + animation: none !important; // Remove focus ring animation otherwise it overrides simulated border via box-shadow } } .globalFilterItem-isDisabled { - background-color: transparentize($euiColorLightShade, .4); + color: $euiColorDarkShade; + background-color: transparentize($euiColorLightShade, 0.5); text-decoration: line-through; font-weight: $euiFontWeightRegular; font-style: italic; @@ -39,12 +45,22 @@ bottom: 0; left: 0; width: $euiSizeXS; - background-color: $euiColorVis0; + background-color: $kbnGlobalFilterItemBorderColor; border-top-left-radius: $euiBorderRadius / 2; border-bottom-left-radius: $euiBorderRadius / 2; } } +.globalFilterItem-isExcluded { + &:not(.globalFilterItem-isDisabled) { + box-shadow: #{$euiFormControlBoxShadow}, inset 0 0 0 1px $kbnGlobalFilterItemBorderColorExcluded; + + &::before { + background-color: $kbnGlobalFilterItemPinnedColorExcluded; + } + } +} + .globalFilterItem__editorForm { padding: $euiSizeM; } diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/_index.scss b/src/legacy/core_plugins/data/public/filter/filter_bar/_index.scss index 3c57b7fe2ca3a..5333aff8b87da 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_bar/_index.scss +++ b/src/legacy/core_plugins/data/public/filter/filter_bar/_index.scss @@ -1,2 +1,3 @@ +@import 'variables'; @import 'global_filter_group'; @import 'global_filter_item'; diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/_variables.scss b/src/legacy/core_plugins/data/public/filter/filter_bar/_variables.scss new file mode 100644 index 0000000000000..3a9a0df4332c8 --- /dev/null +++ b/src/legacy/core_plugins/data/public/filter/filter_bar/_variables.scss @@ -0,0 +1,3 @@ +$kbnGlobalFilterItemBorderColor: tintOrShade($euiColorMediumShade, 35%, 20%); +$kbnGlobalFilterItemBorderColorExcluded: tintOrShade($euiColorDanger, 70%, 50%); +$kbnGlobalFilterItemPinnedColorExcluded: tintOrShade($euiColorDanger, 30%, 20%); diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_bar.tsx b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_bar.tsx index 066adb1e3275e..333e1e328651d 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_bar.tsx +++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_bar.tsx @@ -18,16 +18,6 @@ */ import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiPopover } from '@elastic/eui'; -import { - buildEmptyFilter, - disableFilter, - enableFilter, - Filter, - pinFilter, - toggleFilterDisabled, - toggleFilterNegated, - unpinFilter, -} from '@kbn/es-query'; import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react'; import classNames from 'classnames'; import React, { useState } from 'react'; @@ -38,10 +28,11 @@ import { FilterEditor } from './filter_editor'; import { FilterItem } from './filter_item'; import { FilterOptions } from './filter_options'; import { useKibana, KibanaContextProvider } from '../../../../../../plugins/kibana_react/public'; +import { esFilters } from '../../../../../../plugins/data/public'; interface Props { - filters: Filter[]; - onFiltersUpdated?: (filters: Filter[]) => void; + filters: esFilters.Filter[]; + onFiltersUpdated?: (filters: esFilters.Filter[]) => void; className: string; indexPatterns: IndexPattern[]; intl: InjectedIntl; @@ -87,7 +78,7 @@ function FilterBarUI(props: Props) { return content; } - function onFiltersUpdated(filters: Filter[]) { + function onFiltersUpdated(filters: esFilters.Filter[]) { if (props.onFiltersUpdated) { props.onFiltersUpdated(filters); } @@ -112,13 +103,14 @@ function FilterBarUI(props: Props) { const isPinned = uiSettings!.get('filters:pinnedByDefault'); const [indexPattern] = props.indexPatterns; const index = indexPattern && indexPattern.id; - const newFilter = buildEmptyFilter(isPinned, index); + const newFilter = esFilters.buildEmptyFilter(isPinned, index); const button = ( setIsAddFilterPopoverOpen(true)} data-test-subj="addFilter" + className="globalFilterBar__addButton" > +{' '} void; + onSubmit: (filter: esFilters.Filter) => void; onCancel: () => void; intl: InjectedIntl; } @@ -379,7 +379,9 @@ class FilterEditorUI extends Component { private getFieldFromFilter() { const indexPattern = this.getIndexPatternFromFilter(); - return indexPattern && getFieldFromFilter(this.props.filter as FieldFilter, indexPattern); + return ( + indexPattern && getFieldFromFilter(this.props.filter as esFilters.FieldFilter, indexPattern) + ); } private getSelectedOperator() { diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.test.ts b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.test.ts index 734c5d00e58d5..dbff5096f2287 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.test.ts +++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.test.ts @@ -17,7 +17,6 @@ * under the License. */ -import { FilterStateStore, toggleFilterNegated } from '@kbn/es-query'; import { mockFields, mockIndexPattern } from '../../../../index_patterns'; import { IndexPattern, Field } from '../../../../index'; import { @@ -42,6 +41,7 @@ import { existsFilter } from './fixtures/exists_filter'; import { phraseFilter } from './fixtures/phrase_filter'; import { phrasesFilter } from './fixtures/phrases_filter'; import { rangeFilter } from './fixtures/range_filter'; +import { esFilters } from '../../../../../../../../plugins/data/public'; jest.mock('ui/new_platform'); @@ -81,7 +81,7 @@ describe('Filter editor utils', () => { }); it('should return "is not" for phrase filter', () => { - const negatedPhraseFilter = toggleFilterNegated(phraseFilter); + const negatedPhraseFilter = esFilters.toggleFilterNegated(phraseFilter); const operator = getOperatorFromFilter(negatedPhraseFilter); expect(operator).not.toBeUndefined(); expect(operator && operator.type).toBe('phrase'); @@ -96,7 +96,7 @@ describe('Filter editor utils', () => { }); it('should return "is not one of" for negated phrases filter', () => { - const negatedPhrasesFilter = toggleFilterNegated(phrasesFilter); + const negatedPhrasesFilter = esFilters.toggleFilterNegated(phrasesFilter); const operator = getOperatorFromFilter(negatedPhrasesFilter); expect(operator).not.toBeUndefined(); expect(operator && operator.type).toBe('phrases'); @@ -111,7 +111,7 @@ describe('Filter editor utils', () => { }); it('should return "is not between" for negated range filter', () => { - const negatedRangeFilter = toggleFilterNegated(rangeFilter); + const negatedRangeFilter = esFilters.toggleFilterNegated(rangeFilter); const operator = getOperatorFromFilter(negatedRangeFilter); expect(operator).not.toBeUndefined(); expect(operator && operator.type).toBe('range'); @@ -126,7 +126,7 @@ describe('Filter editor utils', () => { }); it('should return "does not exists" for negated exists filter', () => { - const negatedExistsFilter = toggleFilterNegated(existsFilter); + const negatedExistsFilter = esFilters.toggleFilterNegated(existsFilter); const operator = getOperatorFromFilter(negatedExistsFilter); expect(operator).not.toBeUndefined(); expect(operator && operator.type).toBe('exists'); @@ -246,7 +246,7 @@ describe('Filter editor utils', () => { it('should build phrase filters', () => { const params = 'foo'; const alias = 'bar'; - const state = FilterStateStore.APP_STATE; + const state = esFilters.FilterStateStore.APP_STATE; const filter = buildFilter( mockedIndexPattern, mockedFields[0], @@ -268,7 +268,7 @@ describe('Filter editor utils', () => { it('should build phrases filters', () => { const params = ['foo', 'bar']; const alias = 'bar'; - const state = FilterStateStore.APP_STATE; + const state = esFilters.FilterStateStore.APP_STATE; const filter = buildFilter( mockedIndexPattern, mockedFields[0], @@ -290,7 +290,7 @@ describe('Filter editor utils', () => { it('should build range filters', () => { const params = { from: 'foo', to: 'qux' }; const alias = 'bar'; - const state = FilterStateStore.APP_STATE; + const state = esFilters.FilterStateStore.APP_STATE; const filter = buildFilter( mockedIndexPattern, mockedFields[0], @@ -311,7 +311,7 @@ describe('Filter editor utils', () => { it('should build exists filters', () => { const params = undefined; const alias = 'bar'; - const state = FilterStateStore.APP_STATE; + const state = esFilters.FilterStateStore.APP_STATE; const filter = buildFilter( mockedIndexPattern, mockedFields[0], @@ -332,7 +332,7 @@ describe('Filter editor utils', () => { it('should include disabled state', () => { const params = undefined; const alias = 'bar'; - const state = FilterStateStore.APP_STATE; + const state = esFilters.FilterStateStore.APP_STATE; const filter = buildFilter( mockedIndexPattern, mockedFields[0], @@ -348,7 +348,7 @@ describe('Filter editor utils', () => { it('should negate based on operator', () => { const params = undefined; const alias = 'bar'; - const state = FilterStateStore.APP_STATE; + const state = esFilters.FilterStateStore.APP_STATE; const filter = buildFilter( mockedIndexPattern, mockedFields[0], diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.ts b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.ts index f0628f03c173e..b7d20526a6b92 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.ts +++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.ts @@ -18,42 +18,30 @@ */ import dateMath from '@elastic/datemath'; -import { - buildExistsFilter, - buildPhraseFilter, - buildPhrasesFilter, - buildRangeFilter, - FieldFilter, - Filter, - FilterMeta, - FilterStateStore, - PhraseFilter, - PhrasesFilter, - RangeFilter, -} from '@kbn/es-query'; import { omit } from 'lodash'; import { Ipv4Address } from '../../../../../../../../plugins/kibana_utils/public'; import { Field, IndexPattern, isFilterable } from '../../../../index_patterns'; import { FILTER_OPERATORS, Operator } from './filter_operators'; +import { esFilters } from '../../../../../../../../plugins/data/public'; export function getIndexPatternFromFilter( - filter: Filter, + filter: esFilters.Filter, indexPatterns: IndexPattern[] ): IndexPattern | undefined { return indexPatterns.find(indexPattern => indexPattern.id === filter.meta.index); } -export function getFieldFromFilter(filter: FieldFilter, indexPattern: IndexPattern) { +export function getFieldFromFilter(filter: esFilters.FieldFilter, indexPattern: IndexPattern) { return indexPattern.fields.find(field => field.name === filter.meta.key); } -export function getOperatorFromFilter(filter: Filter) { +export function getOperatorFromFilter(filter: esFilters.Filter) { return FILTER_OPERATORS.find(operator => { return filter.meta.type === operator.type && filter.meta.negate === operator.negate; }); } -export function getQueryDslFromFilter(filter: Filter) { +export function getQueryDslFromFilter(filter: esFilters.Filter) { return omit(filter, ['$state', 'meta']); } @@ -67,16 +55,16 @@ export function getOperatorOptions(field: Field) { }); } -export function getFilterParams(filter: Filter) { +export function getFilterParams(filter: esFilters.Filter) { switch (filter.meta.type) { case 'phrase': - return (filter as PhraseFilter).meta.params.query; + return (filter as esFilters.PhraseFilter).meta.params.query; case 'phrases': - return (filter as PhrasesFilter).meta.params; + return (filter as esFilters.PhrasesFilter).meta.params; case 'range': return { - from: (filter as RangeFilter).meta.params.gte, - to: (filter as RangeFilter).meta.params.lt, + from: (filter as esFilters.RangeFilter).meta.params.gte, + to: (filter as esFilters.RangeFilter).meta.params.lt, }; } } @@ -133,8 +121,8 @@ export function buildFilter( disabled: boolean, params: any, alias: string | null, - store: FilterStateStore -): Filter { + store: esFilters.FilterStateStore +): esFilters.Filter { const filter = buildBaseFilter(indexPattern, field, operator, params); filter.meta.alias = alias; filter.meta.negate = operator.negate; @@ -148,17 +136,17 @@ function buildBaseFilter( field: Field, operator: Operator, params: any -): Filter { +): esFilters.Filter { switch (operator.type) { case 'phrase': - return buildPhraseFilter(field, params, indexPattern); + return esFilters.buildPhraseFilter(field, params, indexPattern); case 'phrases': - return buildPhrasesFilter(field, params, indexPattern); + return esFilters.buildPhrasesFilter(field, params, indexPattern); case 'range': const newParams = { gte: params.from, lt: params.to }; - return buildRangeFilter(field, newParams, indexPattern); + return esFilters.buildRangeFilter(field, newParams, indexPattern); case 'exists': - return buildExistsFilter(field, indexPattern); + return esFilters.buildExistsFilter(field, indexPattern); default: throw new Error(`Unknown operator type: ${operator.type}`); } @@ -170,10 +158,10 @@ export function buildCustomFilter( disabled: boolean, negate: boolean, alias: string | null, - store: FilterStateStore -): Filter { - const meta: FilterMeta = { index, type: 'custom', disabled, negate, alias }; - const filter: Filter = { ...queryDsl, meta }; + store: esFilters.FilterStateStore +): esFilters.Filter { + const meta: esFilters.FilterMeta = { index, type: 'custom', disabled, negate, alias }; + const filter: esFilters.Filter = { ...queryDsl, meta }; filter.$state = { store }; return filter; } diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/exists_filter.ts b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/exists_filter.ts index a17f767006f3e..5af97818f9bfb 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/exists_filter.ts +++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/exists_filter.ts @@ -17,9 +17,9 @@ * under the License. */ -import { ExistsFilter, FilterStateStore } from '@kbn/es-query'; +import { esFilters } from '../../../../../../../../../plugins/data/public'; -export const existsFilter: ExistsFilter = { +export const existsFilter: esFilters.ExistsFilter = { meta: { index: 'logstash-*', negate: false, @@ -29,6 +29,6 @@ export const existsFilter: ExistsFilter = { alias: null, }, $state: { - store: FilterStateStore.APP_STATE, + store: esFilters.FilterStateStore.APP_STATE, }, }; diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/phrase_filter.ts b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/phrase_filter.ts index 77bb8e06c801a..b6c8b9905e6b3 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/phrase_filter.ts +++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/phrase_filter.ts @@ -17,9 +17,9 @@ * under the License. */ -import { FilterStateStore, PhraseFilter } from '@kbn/es-query'; +import { esFilters } from '../../../../../../../../../plugins/data/public'; -export const phraseFilter: PhraseFilter = { +export const phraseFilter: esFilters.PhraseFilter = { meta: { negate: false, index: 'logstash-*', @@ -33,6 +33,6 @@ export const phraseFilter: PhraseFilter = { }, }, $state: { - store: FilterStateStore.APP_STATE, + store: esFilters.FilterStateStore.APP_STATE, }, }; diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/phrases_filter.ts b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/phrases_filter.ts index e86c3ee1318e3..2e2ba4f798bdd 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/phrases_filter.ts +++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/phrases_filter.ts @@ -17,9 +17,9 @@ * under the License. */ -import { FilterStateStore, PhrasesFilter } from '@kbn/es-query'; +import { esFilters } from '../../../../../../../../../plugins/data/public'; -export const phrasesFilter: PhrasesFilter = { +export const phrasesFilter: esFilters.PhrasesFilter = { meta: { index: 'logstash-*', type: 'phrases', @@ -31,6 +31,6 @@ export const phrasesFilter: PhrasesFilter = { alias: null, }, $state: { - store: FilterStateStore.APP_STATE, + store: esFilters.FilterStateStore.APP_STATE, }, }; diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/range_filter.ts b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/range_filter.ts index 46a5181450fea..c6438e30ecec6 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/range_filter.ts +++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/range_filter.ts @@ -17,9 +17,9 @@ * under the License. */ -import { FilterStateStore, RangeFilter } from '@kbn/es-query'; +import { esFilters } from '../../../../../../../../../plugins/data/public'; -export const rangeFilter: RangeFilter = { +export const rangeFilter: esFilters.RangeFilter = { meta: { index: 'logstash-*', negate: false, @@ -34,7 +34,7 @@ export const rangeFilter: RangeFilter = { }, }, $state: { - store: FilterStateStore.APP_STATE, + store: esFilters.FilterStateStore.APP_STATE, }, range: {}, }; diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_display_value.ts b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_display_value.ts index 551b99d01b7da..d8af7b3e97ad2 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_display_value.ts +++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_display_value.ts @@ -18,7 +18,7 @@ */ import { get } from 'lodash'; -import { Filter } from '@kbn/es-query'; +import { esFilters } from '../../../../../../../../plugins/data/public'; import { IndexPattern } from '../../../../index_patterns/index_patterns'; import { Field } from '../../../../index_patterns/fields'; import { getIndexPatternFromFilter } from './filter_editor_utils'; @@ -33,7 +33,10 @@ function getValueFormatter(indexPattern?: IndexPattern, key?: string) { return format; } -export function getDisplayValueFromFilter(filter: Filter, indexPatterns: IndexPattern[]): string { +export function getDisplayValueFromFilter( + filter: esFilters.Filter, + indexPatterns: IndexPattern[] +): string { const indexPattern = getIndexPatternFromFilter(filter, indexPatterns); if (typeof filter.meta.value === 'function') { diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_filter_display_text.ts b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_filter_display_text.ts deleted file mode 100644 index 73ee1a69a2ce3..0000000000000 --- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_filter_display_text.ts +++ /dev/null @@ -1,53 +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 { Filter } from '@kbn/es-query'; -import { i18n } from '@kbn/i18n'; -import { existsOperator, isOneOfOperator } from './filter_operators'; - -export function getFilterDisplayText(filter: Filter, filterDisplayName: string) { - const prefix = filter.meta.negate - ? ` ${i18n.translate('data.filter.filterBar.negatedFilterPrefix', { - defaultMessage: 'NOT ', - })}` - : ''; - - if (filter.meta.alias !== null) { - return `${prefix}${filter.meta.alias}`; - } - - switch (filter.meta.type) { - case 'exists': - return `${prefix}${filter.meta.key} ${existsOperator.message}`; - case 'geo_bounding_box': - return `${prefix}${filter.meta.key}: ${filterDisplayName}`; - case 'geo_polygon': - return `${prefix}${filter.meta.key}: ${filterDisplayName}`; - case 'phrase': - return `${prefix}${filter.meta.key}: ${filterDisplayName}`; - case 'phrases': - return `${prefix}${filter.meta.key} ${isOneOfOperator.message} ${filterDisplayName}`; - case 'query_string': - return `${prefix}${filterDisplayName}`; - case 'range': - return `${prefix}${filter.meta.key}: ${filterDisplayName}`; - default: - return `${prefix}${JSON.stringify(filter.query)}`; - } -} diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_filter_display_text.tsx b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_filter_display_text.tsx new file mode 100644 index 0000000000000..21abcd8510046 --- /dev/null +++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_filter_display_text.tsx @@ -0,0 +1,102 @@ +/* + * 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, { Fragment } from 'react'; +import { EuiTextColor } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; +import { existsOperator, isOneOfOperator } from './filter_operators'; +import { esFilters } from '../../../../../../../../plugins/data/public'; + +export function getFilterDisplayText(filter: esFilters.Filter, filterDisplayName: string) { + const prefixText = filter.meta.negate + ? ` ${i18n.translate('data.filter.filterBar.negatedFilterPrefix', { + defaultMessage: 'NOT ', + })}` + : ''; + const prefix = + filter.meta.negate && !filter.meta.disabled ? ( + {prefixText} + ) : ( + prefixText + ); + + if (filter.meta.alias !== null) { + return `${prefix}${filter.meta.alias}`; + } + + switch (filter.meta.type) { + case 'exists': + return ( + + {prefix} + {filter.meta.key} {existsOperator.message} + + ); + case 'geo_bounding_box': + return ( + + {prefix} + {filter.meta.key}: {filterDisplayName} + + ); + case 'geo_polygon': + return ( + + {prefix} + {filter.meta.key}: {filterDisplayName} + + ); + case 'phrase': + return ( + + {prefix} + {filter.meta.key}: {filterDisplayName} + + ); + case 'phrases': + return ( + + {prefix} + {filter.meta.key} {isOneOfOperator.message} {filterDisplayName} + + ); + case 'query_string': + return ( + + {prefix} + {filterDisplayName} + + ); + case 'range': + case 'phrase': + return ( + + {prefix} + {filter.meta.key}: {filterDisplayName} + + ); + default: + return ( + + {prefix} + {JSON.stringify(filter.query)} + + ); + } +} diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_item.tsx b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_item.tsx index 2e98cbd306e9c..50c1672333801 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_item.tsx +++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_item.tsx @@ -18,13 +18,6 @@ */ import { EuiContextMenu, EuiPopover } from '@elastic/eui'; -import { - Filter, - isFilterPinned, - toggleFilterDisabled, - toggleFilterNegated, - toggleFilterPinned, -} from '@kbn/es-query'; import { InjectedIntl, injectI18n } from '@kbn/i18n/react'; import classNames from 'classnames'; import React, { Component } from 'react'; @@ -33,13 +26,14 @@ import { IndexPattern } from '../../index_patterns'; import { FilterEditor } from './filter_editor'; import { FilterView } from './filter_view'; import { getDisplayValueFromFilter } from './filter_editor/lib/get_display_value'; +import { esFilters } from '../../../../../../plugins/data/public'; interface Props { id: string; - filter: Filter; + filter: esFilters.Filter; indexPatterns: IndexPattern[]; className?: string; - onUpdate: (filter: Filter) => void; + onUpdate: (filter: esFilters.Filter) => void; onRemove: () => void; intl: InjectedIntl; uiSettings: UiSettingsClientContract; @@ -62,7 +56,7 @@ class FilterItemUI extends Component { 'globalFilterItem', { 'globalFilterItem-isDisabled': disabled, - 'globalFilterItem-isPinned': isFilterPinned(filter), + 'globalFilterItem-isPinned': esFilters.isFilterPinned(filter), 'globalFilterItem-isExcluded': negate, }, this.props.className @@ -91,7 +85,7 @@ class FilterItemUI extends Component { id: 0, items: [ { - name: isFilterPinned(filter) + name: esFilters.isFilterPinned(filter) ? this.props.intl.formatMessage({ id: 'data.filter.filterBar.unpinFilterButtonLabel', defaultMessage: 'Unpin', @@ -209,23 +203,23 @@ class FilterItemUI extends Component { }); }; - private onSubmit = (filter: Filter) => { + private onSubmit = (filter: esFilters.Filter) => { this.closePopover(); this.props.onUpdate(filter); }; private onTogglePinned = () => { - const filter = toggleFilterPinned(this.props.filter); + const filter = esFilters.toggleFilterPinned(this.props.filter); this.props.onUpdate(filter); }; private onToggleNegated = () => { - const filter = toggleFilterNegated(this.props.filter); + const filter = esFilters.toggleFilterNegated(this.props.filter); this.props.onUpdate(filter); }; private onToggleDisabled = () => { - const filter = toggleFilterDisabled(this.props.filter); + const filter = esFilters.toggleFilterDisabled(this.props.filter); this.props.onUpdate(filter); }; } diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_view/index.tsx b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_view/index.tsx index a7ea23efce49e..6421691c4ef41 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_view/index.tsx +++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_view/index.tsx @@ -17,14 +17,14 @@ * under the License. */ -import { EuiBadge } from '@elastic/eui'; -import { Filter, isFilterPinned } from '@kbn/es-query'; +import { EuiBadge, useInnerText } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import React, { SFC } from 'react'; import { getFilterDisplayText } from '../filter_editor/lib/get_filter_display_text'; +import { esFilters } from '../../../../../../../plugins/data/public'; interface Props { - filter: Filter; + filter: esFilters.Filter; displayName: string; [propName: string]: any; } @@ -36,12 +36,15 @@ export const FilterView: SFC = ({ displayName, ...rest }: Props) => { + const [ref, innerText] = useInnerText(); + const displayText = {getFilterDisplayText(filter, displayName)}; + let title = i18n.translate('data.filter.filterBar.moreFilterActionsMessage', { - defaultMessage: 'Filter: {displayText}. Select for more filter actions.', - values: { displayText: getFilterDisplayText(filter, displayName) }, + defaultMessage: 'Filter: {innerText}. Select for more filter actions.', + values: { innerText }, }); - if (isFilterPinned(filter)) { + if (esFilters.isFilterPinned(filter)) { title = `${i18n.translate('data.filter.filterBar.pinnedFilterPrefix', { defaultMessage: 'Pinned', })} ${title}`; @@ -72,7 +75,7 @@ export const FilterView: SFC = ({ })} {...rest} > - {getFilterDisplayText(filter, displayName)} + {displayText} ); }; diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.test.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.test.ts index d1cad9a812399..08d5955d3fae9 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.test.ts +++ b/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.test.ts @@ -19,12 +19,11 @@ import sinon from 'sinon'; -import { FilterStateStore } from '@kbn/es-query'; import { FilterStateManager } from './filter_state_manager'; import { StubState } from './test_helpers/stub_state'; import { getFilter } from './test_helpers/get_stub_filter'; -import { FilterManager } from './filter_manager'; +import { FilterManager, esFilters } from '../../../../../../plugins/data/public'; import { coreMock } from '../../../../../../core/public/mocks'; const setupMock = coreMock.createSetup(); @@ -59,7 +58,7 @@ describe('filter_state_manager', () => { }); test('should NOT watch state until both app and global state are defined', done => { - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); + const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); globalStateStub.filters.push(f1); setTimeout(() => { @@ -72,8 +71,8 @@ describe('filter_state_manager', () => { appStateStub.save = sinon.stub(); globalStateStub.save = sinon.stub(); - const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34); - const f2 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); + const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34); + const f2 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); filterManager.setFilters([f1, f2]); @@ -101,33 +100,37 @@ describe('filter_state_manager', () => { }); test('should update filter manager global filters', done => { - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); - globalStateStub.filters.push(f1); - - setTimeout(() => { + const updateSubscription = filterManager.getUpdates$().subscribe(() => { expect(filterManager.getGlobalFilters()).toHaveLength(1); + if (updateSubscription) { + updateSubscription.unsubscribe(); + } done(); - }, 100); - }); - - test('should update filter manager app filters', done => { - expect(filterManager.getAppFilters()).toHaveLength(0); + }); - const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34); - appStateStub.filters.push(f1); + const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, true, true, 'age', 34); + globalStateStub.filters.push(f1); + }); - setTimeout(() => { + test('should update filter manager app filter', done => { + const updateSubscription = filterManager.getUpdates$().subscribe(() => { expect(filterManager.getAppFilters()).toHaveLength(1); + if (updateSubscription) { + updateSubscription.unsubscribe(); + } done(); - }, 100); + }); + + const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34); + appStateStub.filters.push(f1); }); test('should update URL when filter manager filters are set', () => { appStateStub.save = sinon.stub(); globalStateStub.save = sinon.stub(); - const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34); - const f2 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); + const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34); + const f2 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); filterManager.setFilters([f1, f2]); @@ -139,8 +142,8 @@ describe('filter_state_manager', () => { appStateStub.save = sinon.stub(); globalStateStub.save = sinon.stub(); - const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34); - const f2 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); + const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34); + const f2 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); filterManager.addFilters([f1, f2]); @@ -156,7 +159,7 @@ describe('filter_state_manager', () => { ** And triggers *another* filter manager update. */ test('should NOT re-trigger filter manager', done => { - const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34); + const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34); filterManager.setFilters([f1]); const setFiltersSpy = sinon.spy(filterManager, 'setFilters'); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.ts index 06f91e35db96e..61821b7ad45e9 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.ts +++ b/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.ts @@ -17,11 +17,9 @@ * under the License. */ -import { FilterStateStore } from '@kbn/es-query'; - import _ from 'lodash'; import { State } from 'ui/state_management/state'; -import { FilterManager } from './filter_manager'; +import { FilterManager, esFilters } from '../../../../../../plugins/data/public'; type GetAppStateFunc = () => State | undefined | null; @@ -73,8 +71,8 @@ export class FilterStateManager { const newGlobalFilters = _.cloneDeep(globalFilters); const newAppFilters = _.cloneDeep(appFilters); - FilterManager.setFiltersStore(newAppFilters, FilterStateStore.APP_STATE); - FilterManager.setFiltersStore(newGlobalFilters, FilterStateStore.GLOBAL_STATE); + FilterManager.setFiltersStore(newAppFilters, esFilters.FilterStateStore.APP_STATE); + FilterManager.setFiltersStore(newGlobalFilters, esFilters.FilterStateStore.GLOBAL_STATE); this.filterManager.setFilters(newGlobalFilters.concat(newAppFilters)); }, 10); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/index.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/index.ts index ac533eaaf89ea..ebb622783c3d1 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/index.ts +++ b/src/legacy/core_plugins/data/public/filter/filter_manager/index.ts @@ -17,10 +17,4 @@ * under the License. */ -export { FilterManager } from './filter_manager'; export { FilterStateManager } from './filter_state_manager'; - -export { uniqFilters } from './lib/uniq_filters'; -export { extractTimeFilter } from './lib/extract_time_filter'; -export { changeTimeFilter } from './lib/change_time_filter'; -export { onlyDisabledFiltersChanged } from './lib/only_disabled'; diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/dedup_filters.test.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/lib/dedup_filters.test.ts deleted file mode 100644 index 75bd9d5dfbd81..0000000000000 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/dedup_filters.test.ts +++ /dev/null @@ -1,79 +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 { Filter, buildRangeFilter, FilterStateStore, buildQueryFilter } from '@kbn/es-query'; -import { dedupFilters } from './dedup_filters'; - -describe('filter manager utilities', () => { - describe('dedupFilters(existing, filters)', () => { - test('should return only filters which are not in the existing', () => { - const existing: Filter[] = [ - buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index'), - buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'), - ]; - const filters: Filter[] = [ - buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index'), - buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'), - ]; - const results = dedupFilters(existing, filters); - - expect(results).toContain(filters[0]); - expect(results).not.toContain(filters[1]); - }); - - test('should ignore the disabled attribute when comparing ', () => { - const existing: Filter[] = [ - buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index'), - { - ...buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'), - meta: { disabled: true, negate: false, alias: null }, - }, - ]; - const filters: Filter[] = [ - buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index'), - buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'), - ]; - const results = dedupFilters(existing, filters); - - expect(results).toContain(filters[0]); - expect(results).not.toContain(filters[1]); - }); - - test('should ignore $state attribute', () => { - const existing: Filter[] = [ - buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index'), - { - ...buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'), - $state: { store: FilterStateStore.APP_STATE }, - }, - ]; - const filters: Filter[] = [ - buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index'), - { - ...buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'), - $state: { store: FilterStateStore.GLOBAL_STATE }, - }, - ]; - const results = dedupFilters(existing, filters); - - expect(results).toContain(filters[0]); - expect(results).not.toContain(filters[1]); - }); - }); -}); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/get_stub_filter.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/get_stub_filter.ts index 20d9e236f49be..5238efe5efa59 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/get_stub_filter.ts +++ b/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/get_stub_filter.ts @@ -17,15 +17,15 @@ * under the License. */ -import { Filter, FilterStateStore } from '@kbn/es-query'; +import { esFilters } from '../../../../../../../plugins/data/public'; export function getFilter( - store: FilterStateStore, + store: esFilters.FilterStateStore, disabled: boolean, negated: boolean, queryKey: string, queryValue: any -): Filter { +): esFilters.Filter { return { $state: { store, diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/stub_state.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/stub_state.ts index ab92016d1b9ab..f0a4bdef0229d 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/stub_state.ts +++ b/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/stub_state.ts @@ -19,11 +19,11 @@ import sinon from 'sinon'; -import { Filter } from '@kbn/es-query'; import { State } from 'ui/state_management/state'; +import { esFilters } from '../../../../../../../plugins/data/public'; export class StubState implements State { - filters: Filter[]; + filters: esFilters.Filter[]; save: sinon.SinonSpy; constructor() { diff --git a/src/legacy/core_plugins/data/public/filter/index.tsx b/src/legacy/core_plugins/data/public/filter/index.tsx index cda7350ecadef..005c4904a4f39 100644 --- a/src/legacy/core_plugins/data/public/filter/index.tsx +++ b/src/legacy/core_plugins/data/public/filter/index.tsx @@ -17,8 +17,6 @@ * under the License. */ -export * from './filter_service'; - export { FilterBar } from './filter_bar'; export { ApplyFiltersPopover } from './apply_filters'; diff --git a/src/legacy/core_plugins/data/public/index.ts b/src/legacy/core_plugins/data/public/index.ts index cb3869ff57711..502ca206e8e12 100644 --- a/src/legacy/core_plugins/data/public/index.ts +++ b/src/legacy/core_plugins/data/public/index.ts @@ -43,14 +43,7 @@ export { SearchBar, SearchBarProps, SavedQueryAttributes, SavedQuery } from './s /** @public static code */ export * from '../common'; -export { - FilterManager, - FilterStateManager, - uniqFilters, - extractTimeFilter, - changeTimeFilter, - onlyDisabledFiltersChanged, -} from './filter/filter_manager'; +export { FilterStateManager } from './filter/filter_manager'; export { CONTAINS_SPACES, getFromSavedObject, @@ -69,4 +62,11 @@ export { mockIndexPattern, } from './index_patterns'; -export { TimeHistoryContract, TimefilterContract, getTime, InputTimeRange } from './timefilter'; +export { + TimeHistoryContract, + TimefilterContract, + getTime, + InputTimeRange, + extractTimeFilter, + changeTimeFilter, +} from './timefilter'; diff --git a/src/legacy/core_plugins/data/public/index_patterns/fields/field.ts b/src/legacy/core_plugins/data/public/index_patterns/fields/field.ts index 4097f5429a80f..dc5023795bf19 100644 --- a/src/legacy/core_plugins/data/public/index_patterns/fields/field.ts +++ b/src/legacy/core_plugins/data/public/index_patterns/fields/field.ts @@ -30,6 +30,11 @@ import { getNotifications } from '../services'; import { getKbnFieldType } from '../../../../../../plugins/data/public'; +interface FieldSubType { + multi?: { parent: string }; + nested?: { path: string }; +} + export type FieldSpec = Record; export interface FieldType { name: string; @@ -47,8 +52,7 @@ export interface FieldType { visualizable?: boolean; readFromDocValues?: boolean; scripted?: boolean; - parent?: string; - subType?: string; + subType?: FieldSubType; displayName?: string; format?: any; } @@ -68,8 +72,7 @@ export class Field implements FieldType { sortable?: boolean; visualizable?: boolean; scripted?: boolean; - parent?: string; - subType?: string; + subType?: FieldSubType; displayName?: string; format: any; routes: Record = { @@ -165,7 +168,6 @@ export class Field implements FieldType { obj.writ('conflictDescriptions'); // multi info - obj.fact('parent'); obj.fact('subType'); return obj.create(); diff --git a/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_patterns.ts b/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_patterns.ts index d445e2e58cd54..4767b6d3a3ca7 100644 --- a/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_patterns.ts +++ b/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_patterns.ts @@ -29,7 +29,7 @@ import { fieldFormats } from 'ui/registry/field_formats'; import { createIndexPatternCache } from './_pattern_cache'; import { IndexPattern } from './index_pattern'; -import { IndexPatternsApiClient } from './index_patterns_api_client'; +import { IndexPatternsApiClient, GetFieldsOptions } from './index_patterns_api_client'; const indexPatternCache = createIndexPatternCache(); @@ -93,6 +93,14 @@ export class IndexPatterns { }); }; + getFieldsForTimePattern = (options: GetFieldsOptions = {}) => { + return this.apiClient.getFieldsForTimePattern(options); + }; + + getFieldsForWildcard = (options: GetFieldsOptions = {}) => { + return this.apiClient.getFieldsForWildcard(options); + }; + clearCache = (id?: string) => { this.savedObjectsCache = null; if (id) { diff --git a/src/legacy/core_plugins/data/public/legacy.ts b/src/legacy/core_plugins/data/public/legacy.ts index e151726a6d702..b1d838aed992d 100644 --- a/src/legacy/core_plugins/data/public/legacy.ts +++ b/src/legacy/core_plugins/data/public/legacy.ts @@ -35,18 +35,13 @@ */ import { npSetup, npStart } from 'ui/new_platform'; -import { LegacyDependenciesPlugin } from './shim/legacy_dependencies_plugin'; import { plugin } from '.'; const dataPlugin = plugin(); -const legacyPlugin = new LegacyDependenciesPlugin(); -export const setup = dataPlugin.setup(npSetup.core, { - __LEGACY: legacyPlugin.setup(), -}); +export const setup = dataPlugin.setup(npSetup.core); export const start = dataPlugin.start(npStart.core, { data: npStart.plugins.data, uiActions: npSetup.plugins.uiActions, - __LEGACY: legacyPlugin.start(), }); diff --git a/src/legacy/core_plugins/data/public/mocks.ts b/src/legacy/core_plugins/data/public/mocks.ts index 2a82927bb3ebf..4a7fe8efa4068 100644 --- a/src/legacy/core_plugins/data/public/mocks.ts +++ b/src/legacy/core_plugins/data/public/mocks.ts @@ -17,14 +17,12 @@ * under the License. */ -import { filterServiceMock } from './filter/filter_service.mock'; import { indexPatternsServiceMock } from './index_patterns/index_patterns_service.mock'; import { queryServiceMock } from './query/query_service.mock'; import { timefilterServiceMock } from './timefilter/timefilter_service.mock'; function createDataSetupMock() { return { - filter: filterServiceMock.createSetupContract(), indexPatterns: indexPatternsServiceMock.createSetupContract(), query: queryServiceMock.createSetupContract(), timefilter: timefilterServiceMock.createSetupContract(), diff --git a/src/legacy/core_plugins/data/public/plugin.ts b/src/legacy/core_plugins/data/public/plugin.ts index 2b634e54e5cbf..03c9b0e93309d 100644 --- a/src/legacy/core_plugins/data/public/plugin.ts +++ b/src/legacy/core_plugins/data/public/plugin.ts @@ -20,13 +20,9 @@ import { CoreSetup, CoreStart, Plugin } from 'kibana/public'; import { SearchService, SearchStart, createSearchBar, StatetfulSearchBarProps } from './search'; import { QueryService, QuerySetup } from './query'; -import { FilterService, FilterSetup, FilterStart } from './filter'; import { TimefilterService, TimefilterSetup } from './timefilter'; import { IndexPatternsService, IndexPatternsSetup, IndexPatternsStart } from './index_patterns'; -import { - LegacyDependenciesPluginSetup, - LegacyDependenciesPluginStart, -} from './shim/legacy_dependencies_plugin'; +import { Storage, IStorageWrapper } from '../../../../../src/plugins/kibana_utils/public'; import { DataPublicPluginStart } from '../../../../plugins/data/public'; import { initLegacyModule } from './shim/legacy_module'; import { IUiActionsSetup } from '../../../../plugins/ui_actions/public'; @@ -36,19 +32,9 @@ import { } from './filter/action/apply_filter_action'; import { APPLY_FILTER_TRIGGER } from '../../../../plugins/embeddable/public'; -/** - * Interface for any dependencies on other plugins' `setup` contracts. - * - * @internal - */ -export interface DataPluginSetupDependencies { - __LEGACY: LegacyDependenciesPluginSetup; -} - export interface DataPluginStartDependencies { data: DataPublicPluginStart; uiActions: IUiActionsSetup; - __LEGACY: LegacyDependenciesPluginStart; } /** @@ -60,7 +46,6 @@ export interface DataSetup { query: QuerySetup; timefilter: TimefilterSetup; indexPatterns: IndexPatternsSetup; - filter: FilterSetup; } /** @@ -72,7 +57,6 @@ export interface DataStart { query: QuerySetup; timefilter: TimefilterSetup; indexPatterns: IndexPatternsStart; - filter: FilterStart; search: SearchStart; ui: { SearchBar: React.ComponentType; @@ -90,42 +74,35 @@ export interface DataStart { * in the setup/start interfaces. The remaining items exported here are either types, * or static code. */ -export class DataPlugin - implements - Plugin { - // Exposed services, sorted alphabetically - private readonly filter: FilterService = new FilterService(); + +export class DataPlugin implements Plugin { private readonly indexPatterns: IndexPatternsService = new IndexPatternsService(); private readonly query: QueryService = new QueryService(); private readonly search: SearchService = new SearchService(); private readonly timefilter: TimefilterService = new TimefilterService(); private setupApi!: DataSetup; + private storage!: IStorageWrapper; - public setup(core: CoreSetup, { __LEGACY }: DataPluginSetupDependencies): DataSetup { + public setup(core: CoreSetup): DataSetup { const { uiSettings } = core; + this.storage = new Storage(window.localStorage); + const timefilterService = this.timefilter.setup({ uiSettings, - store: __LEGACY.storage, - }); - const filterService = this.filter.setup({ - uiSettings, + storage: this.storage, }); this.setupApi = { indexPatterns: this.indexPatterns.setup(), query: this.query.setup(), timefilter: timefilterService, - filter: filterService, }; return this.setupApi; } - public start( - core: CoreStart, - { __LEGACY, data, uiActions }: DataPluginStartDependencies - ): DataStart { + public start(core: CoreStart, { data, uiActions }: DataPluginStartDependencies): DataStart { const { uiSettings, http, notifications, savedObjects } = core; const indexPatternsService = this.indexPatterns.start({ @@ -140,14 +117,14 @@ export class DataPlugin const SearchBar = createSearchBar({ core, data, - store: __LEGACY.storage, + storage: this.storage, timefilter: this.setupApi.timefilter, - filterManager: this.setupApi.filter.filterManager, }); uiActions.registerAction( createFilterAction( - this.setupApi.filter.filterManager, + core.overlays, + data.query.filterManager, this.setupApi.timefilter.timefilter, indexPatternsService ) @@ -167,7 +144,6 @@ export class DataPlugin public stop() { this.indexPatterns.stop(); - this.filter.stop(); this.query.stop(); this.search.stop(); this.timefilter.stop(); diff --git a/src/legacy/core_plugins/data/public/query/persisted_log/persisted_log.ts b/src/legacy/core_plugins/data/public/query/persisted_log/persisted_log.ts index e0e6a0d0c44e4..553b0bf5ef7e0 100644 --- a/src/legacy/core_plugins/data/public/query/persisted_log/persisted_log.ts +++ b/src/legacy/core_plugins/data/public/query/persisted_log/persisted_log.ts @@ -20,7 +20,7 @@ import _ from 'lodash'; import * as Rx from 'rxjs'; import { map } from 'rxjs/operators'; -import { Storage } from '../../types'; +import { IStorageWrapper } from 'src/plugins/kibana_utils/public'; const defaultIsDuplicate = (oldItem: any, newItem: any) => { return _.isEqual(oldItem, newItem); @@ -37,12 +37,12 @@ export class PersistedLog { public maxLength?: number; public filterDuplicates?: boolean; public isDuplicate: (oldItem: T, newItem: T) => boolean; - public storage: Storage; + public storage: IStorageWrapper; public items: T[]; private update$ = new Rx.BehaviorSubject(undefined); - constructor(name: string, options: PersistedLogOptions = {}, storage: Storage) { + constructor(name: string, options: PersistedLogOptions = {}, storage: IStorageWrapper) { this.name = name; this.maxLength = typeof options.maxLength === 'string' diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap b/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap index 286e60cca9712..5dc8702411783 100644 --- a/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap +++ b/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap @@ -304,12 +304,12 @@ exports[`QueryBarInput Should disable autoFocus on EuiFieldText when disableAuto "update": [MockFunction], }, }, - "store": Object { + "storage": Object { "clear": [MockFunction], "get": [MockFunction], "remove": [MockFunction], "set": [MockFunction], - "store": Object { + "storage": Object { "clear": [MockFunction], "getItem": [MockFunction], "key": [MockFunction], @@ -349,7 +349,7 @@ exports[`QueryBarInput Should disable autoFocus on EuiFieldText when disableAuto } } > - - - - + + @@ -1418,12 +1418,12 @@ exports[`QueryBarInput Should pass the query language to the language switcher 1 "update": [MockFunction], }, }, - "store": Object { + "storage": Object { "clear": [MockFunction], "get": [MockFunction], "remove": [MockFunction], "set": [MockFunction], - "store": Object { + "storage": Object { "clear": [MockFunction], "getItem": [MockFunction], "key": [MockFunction], @@ -1463,7 +1463,7 @@ exports[`QueryBarInput Should pass the query language to the language switcher 1 } } > - - - - + + @@ -2529,12 +2529,12 @@ exports[`QueryBarInput Should render the given query 1`] = ` "update": [MockFunction], }, }, - "store": Object { + "storage": Object { "clear": [MockFunction], "get": [MockFunction], "remove": [MockFunction], "set": [MockFunction], - "store": Object { + "storage": Object { "clear": [MockFunction], "getItem": [MockFunction], "key": [MockFunction], @@ -2574,7 +2574,7 @@ exports[`QueryBarInput Should render the given query 1`] = ` } } > - - - - + + diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.tsx index f1249da997dfe..3edb689ca2bfe 100644 --- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.tsx +++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.tsx @@ -58,7 +58,7 @@ const createMockWebStorage = () => ({ }); const createMockStorage = () => ({ - store: createMockWebStorage(), + storage: createMockWebStorage(), get: jest.fn(), set: jest.fn(), remove: jest.fn(), @@ -80,7 +80,7 @@ const mockIndexPattern = { ], } as IndexPattern; -function wrapQueryBarInputInContext(testProps: any, store?: any) { +function wrapQueryBarInputInContext(testProps: any, storage?: any) { const defaultOptions = { screenTitle: 'Another Screen', intl: null as any, @@ -89,7 +89,7 @@ function wrapQueryBarInputInContext(testProps: any, store?: any) { const services = { ...startMock, appName: testProps.appName || 'test', - store: store || createMockStorage(), + storage: storage || createMockStorage(), }; return ( diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx index a57018b118185..9f03f7fd30778 100644 --- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx +++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx @@ -21,11 +21,19 @@ import { Component } from 'react'; import React from 'react'; import { i18n } from '@kbn/i18n'; -import { EuiFieldText, EuiOutsideClickDetector, PopoverAnchorPosition } from '@elastic/eui'; - -import { InjectedIntl, injectI18n } from '@kbn/i18n/react'; +import { + EuiFieldText, + EuiOutsideClickDetector, + PopoverAnchorPosition, + EuiFlexGroup, + EuiFlexItem, + EuiButton, + EuiLink, +} from '@elastic/eui'; + +import { InjectedIntl, injectI18n, FormattedMessage } from '@kbn/i18n/react'; import { debounce, compact, isEqual } from 'lodash'; - +import { Toast } from 'src/core/public'; import { AutocompleteSuggestion, AutocompleteSuggestionType, @@ -302,20 +310,13 @@ export class QueryBarInputUI extends Component { } }; - private selectSuggestion = ({ - type, - text, - start, - end, - }: { - type: AutocompleteSuggestionType; - text: string; - start: number; - end: number; - }) => { + private selectSuggestion = (suggestion: AutocompleteSuggestion) => { if (!this.inputRef) { return; } + const { type, text, start, end, cursorIndex } = suggestion; + + this.handleNestedFieldSyntaxNotification(suggestion); const query = this.getQueryString(); const { selectionStart, selectionEnd } = this.inputRef; @@ -328,12 +329,75 @@ export class QueryBarInputUI extends Component { this.onQueryStringChange(newQueryString); + this.setState({ + selectionStart: start + (cursorIndex ? cursorIndex : text.length), + selectionEnd: start + (cursorIndex ? cursorIndex : text.length), + }); + if (type === recentSearchType) { this.setState({ isSuggestionsVisible: false, index: null }); this.onSubmit({ query: newQueryString, language: this.props.query.language }); } }; + private handleNestedFieldSyntaxNotification = (suggestion: AutocompleteSuggestion) => { + if ( + 'field' in suggestion && + suggestion.field.subType && + suggestion.field.subType.nested && + !this.services.storage.get('kibana.KQLNestedQuerySyntaxInfoOptOut') + ) { + const { notifications, docLinks } = this.services; + + const onKQLNestedQuerySyntaxInfoOptOut = (toast: Toast) => { + if (!this.services.storage) return; + this.services.storage.set('kibana.KQLNestedQuerySyntaxInfoOptOut', true); + notifications!.toasts.remove(toast); + }; + + if (notifications && docLinks) { + const toast = notifications.toasts.add({ + title: this.props.intl.formatMessage({ + id: 'data.query.queryBar.KQLNestedQuerySyntaxInfoTitle', + defaultMessage: 'KQL nested query syntax', + }), + text: ( +
+

+ + + + ), + }} + /> +

+ + + onKQLNestedQuerySyntaxInfoOptOut(toast)}> + + + + +
+ ), + }); + } + } + }; + private increaseLimit = () => { this.setState({ suggestionLimit: this.state.suggestionLimit + 50, @@ -365,7 +429,7 @@ export class QueryBarInputUI extends Component { body: JSON.stringify({ opt_in: language === 'kuery' }), }); - this.services.store.set('kibana.userQueryLanguage', language); + this.services.storage.set('kibana.userQueryLanguage', language); const newQuery = { query: '', language }; this.onChange(newQuery); @@ -387,10 +451,10 @@ export class QueryBarInputUI extends Component { }; private initPersistedLog = () => { - const { uiSettings, store, appName } = this.services; + const { uiSettings, storage, appName } = this.services; this.persistedLog = this.props.persistedLog ? this.props.persistedLog - : getQueryLog(uiSettings, store, appName, this.props.query.language); + : getQueryLog(uiSettings, storage, appName, this.props.query.language); }; public onMouseEnterSuggestion = (index: number) => { diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.test.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.test.tsx index 7ab191062e32d..7281eea956fbf 100644 --- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.test.tsx +++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.test.tsx @@ -79,7 +79,7 @@ const createMockWebStorage = () => ({ }); const createMockStorage = () => ({ - store: createMockWebStorage(), + storage: createMockWebStorage(), get: jest.fn(), set: jest.fn(), remove: jest.fn(), @@ -112,7 +112,7 @@ function wrapQueryBarTopRowInContext(testProps: any) { const services = { ...startMock, appName: 'discover', - store: createMockStorage(), + storage: createMockStorage(), }; return ( diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.tsx index 9a846ab82f47c..d2953621d86d1 100644 --- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.tsx +++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.tsx @@ -21,7 +21,7 @@ import dateMath from '@elastic/datemath'; import { doesKueryExpressionHaveLuceneSyntaxError } from '@kbn/es-query'; import classNames from 'classnames'; -import React, { useState, useEffect } from 'react'; +import React, { useState } from 'react'; import { EuiButton, @@ -73,17 +73,15 @@ function QueryBarTopRowUI(props: Props) { const [isDateRangeInvalid, setIsDateRangeInvalid] = useState(false); const kibana = useKibana(); - const { uiSettings, notifications, store, appName, docLinks } = kibana.services; + const { uiSettings, notifications, storage, appName, docLinks } = kibana.services; const kueryQuerySyntaxLink: string = docLinks!.links.query.kueryQuerySyntax; const queryLanguage = props.query && props.query.language; - let persistedLog: PersistedLog | undefined; - - useEffect(() => { - if (!props.query) return; - persistedLog = getQueryLog(uiSettings!, store, appName, props.query.language); - }, [queryLanguage]); + const persistedLog: PersistedLog | undefined = React.useMemo( + () => (queryLanguage ? getQueryLog(uiSettings!, storage, appName, queryLanguage) : undefined), + [queryLanguage] + ); function onClickSubmitButton(event: React.MouseEvent) { if (persistedLog && props.query) { @@ -211,7 +209,7 @@ function QueryBarTopRowUI(props: Props) { } function shouldRenderQueryInput(): boolean { - return Boolean(props.showQueryInput && props.indexPatterns && props.query && store); + return Boolean(props.showQueryInput && props.indexPatterns && props.query && storage); } function renderUpdateButton() { @@ -293,7 +291,7 @@ function QueryBarTopRowUI(props: Props) { if ( language === 'kuery' && typeof query === 'string' && - (!store || !store.get('kibana.luceneSyntaxWarningOptOut')) && + (!storage || !storage.get('kibana.luceneSyntaxWarningOptOut')) && doesKueryExpressionHaveLuceneSyntaxError(query) ) { const toast = notifications!.toasts.addWarning({ @@ -337,8 +335,8 @@ function QueryBarTopRowUI(props: Props) { } function onLuceneSyntaxWarningOptOut(toast: Toast) { - if (!store) return; - store.set('kibana.luceneSyntaxWarningOptOut', true); + if (!storage) return; + storage.set('kibana.luceneSyntaxWarningOptOut', true); notifications!.toasts.remove(toast); } diff --git a/src/legacy/core_plugins/data/public/query/query_bar/lib/get_query_log.ts b/src/legacy/core_plugins/data/public/query/query_bar/lib/get_query_log.ts index 8b26e14c6ed7b..f78eb5e07f189 100644 --- a/src/legacy/core_plugins/data/public/query/query_bar/lib/get_query_log.ts +++ b/src/legacy/core_plugins/data/public/query/query_bar/lib/get_query_log.ts @@ -18,12 +18,12 @@ */ import { UiSettingsClientContract } from 'src/core/public'; +import { IStorageWrapper } from 'src/plugins/kibana_utils/public'; import { PersistedLog } from '../../persisted_log'; -import { Storage } from '../../../types'; export function getQueryLog( uiSettings: UiSettingsClientContract, - store: Storage, + storage: IStorageWrapper, appName: string, language: string ) { @@ -33,6 +33,6 @@ export function getQueryLog( maxLength: uiSettings.get('history:limit'), filterDuplicates: true, }, - store + storage ); } diff --git a/src/legacy/core_plugins/data/public/search/search_bar/components/create_search_bar.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/create_search_bar.tsx index d801f8a69e2d6..12cea46f158c1 100644 --- a/src/legacy/core_plugins/data/public/search/search_bar/components/create_search_bar.tsx +++ b/src/legacy/core_plugins/data/public/search/search_bar/components/create_search_bar.tsx @@ -19,30 +19,29 @@ import React, { useState, useEffect } from 'react'; import { Subscription } from 'rxjs'; -import { Filter } from '@kbn/es-query'; import { CoreStart } from 'src/core/public'; import { DataPublicPluginStart } from 'src/plugins/data/public'; -import { Storage } from '../../../types'; +import { IStorageWrapper } from 'src/plugins/kibana_utils/public'; import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public'; import { TimefilterSetup } from '../../../timefilter'; -import { FilterManager, SearchBar } from '../../../'; +import { SearchBar } from '../../../'; import { SearchBarOwnProps } from '.'; +import { esFilters } from '../../../../../../../plugins/data/public'; interface StatefulSearchBarDeps { core: CoreStart; data: DataPublicPluginStart; - store: Storage; + storage: IStorageWrapper; timefilter: TimefilterSetup; - filterManager: FilterManager; } export type StatetfulSearchBarProps = SearchBarOwnProps & { appName: string; }; -const defaultFiltersUpdated = (filterManager: FilterManager) => { - return (filters: Filter[]) => { - filterManager.setFilters(filters); +const defaultFiltersUpdated = (data: DataPublicPluginStart) => { + return (filters: esFilters.Filter[]) => { + data.query.filterManager.setFilters(filters); }; }; @@ -55,16 +54,11 @@ const defaultOnRefreshChange = (timefilter: TimefilterSetup) => { }; }; -export function createSearchBar({ - core, - store, - timefilter, - filterManager, - data, -}: StatefulSearchBarDeps) { +export function createSearchBar({ core, storage, timefilter, data }: StatefulSearchBarDeps) { // App name should come from the core application service. // Until it's available, we'll ask the user to provide it for the pre-wired component. return (props: StatetfulSearchBarProps) => { + const { filterManager } = data.query; const tfRefreshInterval = timefilter.timefilter.getRefreshInterval(); const fmFilters = filterManager.getFilters(); const [refreshInterval, setRefreshInterval] = useState(tfRefreshInterval.value); @@ -113,7 +107,7 @@ export function createSearchBar({ services={{ appName: props.appName, data, - store, + storage, ...core, }} > @@ -124,7 +118,7 @@ export function createSearchBar({ refreshInterval={refreshInterval} isRefreshPaused={refreshPaused} filters={filters} - onFiltersUpdated={defaultFiltersUpdated(filterManager)} + onFiltersUpdated={defaultFiltersUpdated(data)} onRefreshChange={defaultOnRefreshChange(timefilter)} {...props} /> diff --git a/src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/save_query_form.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/save_query_form.tsx index 6fd5274d09ec6..7a9786f5f9ce8 100644 --- a/src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/save_query_form.tsx +++ b/src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/save_query_form.tsx @@ -83,7 +83,7 @@ export const SaveQueryForm: FunctionComponent = ({ setSavedQueries(sortedAllSavedQueries); }; fetchQueries(); - }, []); + }, [savedQueryService]); const savedQueryDescriptionText = i18n.translate( 'data.search.searchBar.savedQueryDescriptionText', diff --git a/src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/saved_query_management_component.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/saved_query_management_component.tsx index b2e47e8b4e850..b73b8edb39e54 100644 --- a/src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/saved_query_management_component.tsx +++ b/src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/saved_query_management_component.tsx @@ -29,6 +29,7 @@ import { EuiPagination, EuiText, EuiSpacer, + EuiIcon, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; @@ -75,7 +76,7 @@ export const SavedQueryManagementComponent: FunctionComponent = ({ if (isOpen) { fetchCountAndSavedQueries(); } - }, [isOpen, activePage]); + }, [isOpen, activePage, savedQueryService]); const goToPage = (pageNumber: number) => { setActivePage(pageNumber); @@ -116,8 +117,6 @@ export const SavedQueryManagementComponent: FunctionComponent = ({ const savedQueryPopoverButton = ( { setIsOpen(!isOpen); }} @@ -129,7 +128,8 @@ export const SavedQueryManagementComponent: FunctionComponent = ({ })} data-test-subj="saved-query-management-popover-button" > - # + + ); diff --git a/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx index 73e81a38572c3..9b77ec369c55b 100644 --- a/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx +++ b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx @@ -33,14 +33,14 @@ const timefilterSetupMock = timefilterServiceMock.createSetupContract(); jest.mock('../../../../../data/public', () => { return { - FilterBar: () =>
, - QueryBarInput: () =>
, + FilterBar: () =>
, + QueryBarInput: () =>
, }; }); jest.mock('../../../query/query_bar', () => { return { - QueryBarTopRow: () =>
, + QueryBarTopRow: () =>
, }; }); @@ -56,7 +56,7 @@ const createMockWebStorage = () => ({ }); const createMockStorage = () => ({ - store: createMockWebStorage(), + storage: createMockWebStorage(), get: jest.fn(), set: jest.fn(), remove: jest.fn(), @@ -95,7 +95,7 @@ function wrapSearchBarInContext(testProps: any) { savedObjects: startMock.savedObjects, notifications: startMock.notifications, http: startMock.http, - store: createMockStorage(), + storage: createMockStorage(), }; return ( diff --git a/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx index a03019da4e0d7..d3a26239e1006 100644 --- a/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx +++ b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx @@ -18,7 +18,6 @@ */ import { compact } from 'lodash'; -import { Filter } from '@kbn/es-query'; import { InjectedIntl, injectI18n } from '@kbn/i18n/react'; import classNames from 'classnames'; import React, { Component } from 'react'; @@ -39,14 +38,15 @@ import { KibanaReactContextValue, } from '../../../../../../../plugins/kibana_react/public'; import { IDataPluginServices } from '../../../types'; +import { esFilters } from '../../../../../../../plugins/data/public'; interface SearchBarInjectedDeps { kibana: KibanaReactContextValue; intl: InjectedIntl; timeHistory: TimeHistoryContract; // Filter bar - onFiltersUpdated?: (filters: Filter[]) => void; - filters?: Filter[]; + onFiltersUpdated?: (filters: esFilters.Filter[]) => void; + filters?: esFilters.Filter[]; // Date picker dateRangeFrom?: string; dateRangeTo?: string; @@ -368,7 +368,7 @@ class SearchBarUI extends Component { onLoad={this.onLoadSavedQuery} savedQueryService={this.savedQueryService} onClearSavedQuery={this.props.onClearSavedQuery} - > + /> ); let queryBar; diff --git a/src/legacy/core_plugins/data/public/search/search_bar/index.tsx b/src/legacy/core_plugins/data/public/search/search_bar/index.tsx index 0c677bea98536..ebde9d60b0b51 100644 --- a/src/legacy/core_plugins/data/public/search/search_bar/index.tsx +++ b/src/legacy/core_plugins/data/public/search/search_bar/index.tsx @@ -17,9 +17,9 @@ * under the License. */ -import { Filter } from '@kbn/es-query'; import { RefreshInterval, TimeRange } from 'src/plugins/data/public'; import { Query } from '../../query/query_bar'; +import { esFilters } from '../../../../../../plugins/data/public'; export * from './components'; @@ -36,6 +36,6 @@ export interface SavedQueryAttributes { title: string; description: string; query: Query; - filters?: Filter[]; + filters?: esFilters.Filter[]; timefilter?: SavedQueryTimeFilter; } diff --git a/src/legacy/core_plugins/data/public/search/search_bar/lib/saved_query_service.test.ts b/src/legacy/core_plugins/data/public/search/search_bar/lib/saved_query_service.test.ts index ac5fdb7fe99d5..415da8a2c32cc 100644 --- a/src/legacy/core_plugins/data/public/search/search_bar/lib/saved_query_service.test.ts +++ b/src/legacy/core_plugins/data/public/search/search_bar/lib/saved_query_service.test.ts @@ -19,7 +19,7 @@ import { SavedQueryAttributes } from '../index'; import { createSavedQueryService } from './saved_query_service'; -import { FilterStateStore } from '@kbn/es-query'; +import { esFilters } from '../../../../../../../plugins/data/public'; const savedQueryAttributes: SavedQueryAttributes = { title: 'foo', @@ -43,7 +43,7 @@ const savedQueryAttributesWithFilters: SavedQueryAttributes = { filters: [ { query: { match_all: {} }, - $state: { store: FilterStateStore.APP_STATE }, + $state: { store: esFilters.FilterStateStore.APP_STATE }, meta: { disabled: false, negate: false, diff --git a/src/legacy/core_plugins/data/public/shim/legacy_module.ts b/src/legacy/core_plugins/data/public/shim/legacy_module.ts index 54f513d07215d..b0ed3d43a4c8c 100644 --- a/src/legacy/core_plugins/data/public/shim/legacy_module.ts +++ b/src/legacy/core_plugins/data/public/shim/legacy_module.ts @@ -25,9 +25,6 @@ import { wrapInI18nContext } from 'ui/i18n'; import { uiModules } from 'ui/modules'; import { npStart } from 'ui/new_platform'; import { FilterBar, ApplyFiltersPopover } from '../filter'; - -// @ts-ignore -import { mapAndFlattenFilters } from '../filter/filter_manager/lib/map_and_flatten_filters'; import { IndexPatterns } from '../index_patterns/index_patterns'; /** @internal */ diff --git a/src/legacy/core_plugins/data/public/timefilter/index.ts b/src/legacy/core_plugins/data/public/timefilter/index.ts index 17564801cf148..a6260e782c12f 100644 --- a/src/legacy/core_plugins/data/public/timefilter/index.ts +++ b/src/legacy/core_plugins/data/public/timefilter/index.ts @@ -23,3 +23,5 @@ export * from './types'; export { Timefilter, TimefilterContract } from './timefilter'; export { TimeHistory, TimeHistoryContract } from './time_history'; export { getTime } from './get_time'; +export { changeTimeFilter } from './lib/change_time_filter'; +export { extractTimeFilter } from './lib/extract_time_filter'; diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/change_time_filter.test.ts b/src/legacy/core_plugins/data/public/timefilter/lib/change_time_filter.test.ts similarity index 87% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/change_time_filter.test.ts rename to src/legacy/core_plugins/data/public/timefilter/lib/change_time_filter.test.ts index 2e397ff931bb6..df3e33060b01f 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/change_time_filter.test.ts +++ b/src/legacy/core_plugins/data/public/timefilter/lib/change_time_filter.test.ts @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -import { RangeFilter } from '@kbn/es-query'; import { changeTimeFilter } from './change_time_filter'; import { TimeRange } from 'src/plugins/data/public'; -import { timefilterServiceMock } from '../../../timefilter/timefilter_service.mock'; +import { timefilterServiceMock } from '../timefilter_service.mock'; +import { esFilters } from '../../../../../../plugins/data/public'; const timefilterMock = timefilterServiceMock.createSetupContract(); const timefilter = timefilterMock.timefilter; @@ -42,7 +42,7 @@ describe('changeTimeFilter()', () => { test('should change the timefilter to match the range gt/lt', () => { const filter: any = { range: { '@timestamp': { gt, lt } } }; - changeTimeFilter(timefilter, filter as RangeFilter); + changeTimeFilter(timefilter, filter as esFilters.RangeFilter); const { to, from } = timefilter.getTime(); @@ -52,7 +52,7 @@ describe('changeTimeFilter()', () => { test('should change the timefilter to match the range gte/lte', () => { const filter: any = { range: { '@timestamp': { gte: gt, lte: lt } } }; - changeTimeFilter(timefilter, filter as RangeFilter); + changeTimeFilter(timefilter, filter as esFilters.RangeFilter); const { to, from } = timefilter.getTime(); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/change_time_filter.ts b/src/legacy/core_plugins/data/public/timefilter/lib/change_time_filter.ts similarity index 83% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/change_time_filter.ts rename to src/legacy/core_plugins/data/public/timefilter/lib/change_time_filter.ts index 8cd1ce5ba6c84..7943aab3c151f 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/change_time_filter.ts +++ b/src/legacy/core_plugins/data/public/timefilter/lib/change_time_filter.ts @@ -19,10 +19,10 @@ import moment from 'moment'; import { keys } from 'lodash'; -import { RangeFilter } from '@kbn/es-query'; -import { TimefilterContract } from '../../../timefilter'; +import { TimefilterContract } from '../timefilter'; +import { esFilters } from '../../../../../../plugins/data/public'; -export function convertRangeFilterToTimeRange(filter: RangeFilter) { +export function convertRangeFilterToTimeRange(filter: esFilters.RangeFilter) { const key = keys(filter.range)[0]; const values = filter.range[key]; @@ -32,6 +32,6 @@ export function convertRangeFilterToTimeRange(filter: RangeFilter) { }; } -export function changeTimeFilter(timeFilter: TimefilterContract, filter: RangeFilter) { +export function changeTimeFilter(timeFilter: TimefilterContract, filter: esFilters.RangeFilter) { timeFilter.setTime(convertRangeFilterToTimeRange(filter)); } diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/extract_time_filter.test.ts b/src/legacy/core_plugins/data/public/timefilter/lib/extract_time_filter.test.ts similarity index 63% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/extract_time_filter.test.ts rename to src/legacy/core_plugins/data/public/timefilter/lib/extract_time_filter.test.ts index d55c9babeed79..981c50844c4f3 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/extract_time_filter.test.ts +++ b/src/legacy/core_plugins/data/public/timefilter/lib/extract_time_filter.test.ts @@ -17,15 +17,23 @@ * under the License. */ -import { Filter, buildRangeFilter, buildQueryFilter, buildPhraseFilter } from '@kbn/es-query'; import { extractTimeFilter } from './extract_time_filter'; +import { esFilters } from '../../../../../../plugins/data/public'; describe('filter manager utilities', () => { describe('extractTimeFilter()', () => { test('should detect timeFilter', async () => { - const filters: Filter[] = [ - buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'logstash-*'), - buildRangeFilter({ name: 'time' }, { gt: 1388559600000, lt: 1388646000000 }, 'logstash-*'), + const filters: esFilters.Filter[] = [ + esFilters.buildQueryFilter( + { _type: { match: { query: 'apache', type: 'phrase' } } }, + 'logstash-*', + '' + ), + esFilters.buildRangeFilter( + { name: 'time' }, + { gt: 1388559600000, lt: 1388646000000 }, + 'logstash-*' + ), ]; const result = await extractTimeFilter('time', filters); @@ -34,9 +42,13 @@ describe('filter manager utilities', () => { }); test("should not return timeFilter when name doesn't match", async () => { - const filters: Filter[] = [ - buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'logstash-*'), - buildRangeFilter({ name: '@timestamp' }, { from: 1, to: 2 }, 'logstash-*'), + const filters: esFilters.Filter[] = [ + esFilters.buildQueryFilter( + { _type: { match: { query: 'apache', type: 'phrase' } } }, + 'logstash-*', + '' + ), + esFilters.buildRangeFilter({ name: '@timestamp' }, { from: 1, to: 2 }, 'logstash-*', ''), ]; const result = await extractTimeFilter('time', filters); @@ -45,9 +57,13 @@ describe('filter manager utilities', () => { }); test('should not return a non range filter, even when names match', async () => { - const filters: Filter[] = [ - buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'logstash-*'), - buildPhraseFilter({ name: 'time' }, 'banana', 'logstash-*'), + const filters: esFilters.Filter[] = [ + esFilters.buildQueryFilter( + { _type: { match: { query: 'apache', type: 'phrase' } } }, + 'logstash-*', + '' + ), + esFilters.buildPhraseFilter({ name: 'time' }, 'banana', 'logstash-*'), ]; const result = await extractTimeFilter('time', filters); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/extract_time_filter.ts b/src/legacy/core_plugins/data/public/timefilter/lib/extract_time_filter.ts similarity index 82% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/extract_time_filter.ts rename to src/legacy/core_plugins/data/public/timefilter/lib/extract_time_filter.ts index 22bda5b21295e..4281610cb63e4 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/extract_time_filter.ts +++ b/src/legacy/core_plugins/data/public/timefilter/lib/extract_time_filter.ts @@ -18,13 +18,13 @@ */ import { keys, partition } from 'lodash'; -import { Filter, isRangeFilter, RangeFilter } from '@kbn/es-query'; +import { esFilters } from '../../../../../../plugins/data/public'; -export function extractTimeFilter(timeFieldName: string, filters: Filter[]) { - const [timeRangeFilter, restOfFilters] = partition(filters, (obj: Filter) => { +export function extractTimeFilter(timeFieldName: string, filters: esFilters.Filter[]) { + const [timeRangeFilter, restOfFilters] = partition(filters, (obj: esFilters.Filter) => { let key; - if (isRangeFilter(obj)) { + if (esFilters.isRangeFilter(obj)) { key = keys(obj.range)[0]; } @@ -33,6 +33,6 @@ export function extractTimeFilter(timeFieldName: string, filters: Filter[]) { return { restOfFilters, - timeRangeFilter: timeRangeFilter[0] as RangeFilter | undefined, + timeRangeFilter: timeRangeFilter[0] as esFilters.RangeFilter | undefined, }; } diff --git a/src/legacy/core_plugins/data/public/timefilter/time_history.ts b/src/legacy/core_plugins/data/public/timefilter/time_history.ts index 22778d1adea3c..36ad1a4427a47 100644 --- a/src/legacy/core_plugins/data/public/timefilter/time_history.ts +++ b/src/legacy/core_plugins/data/public/timefilter/time_history.ts @@ -19,13 +19,13 @@ import moment from 'moment'; import { TimeRange } from 'src/plugins/data/public'; +import { IStorageWrapper } from 'src/plugins/kibana_utils/public'; import { PersistedLog } from '../query/persisted_log'; -import { Storage } from '../types'; export class TimeHistory { private history: PersistedLog; - constructor(store: Storage) { + constructor(storage: IStorageWrapper) { const historyOptions = { maxLength: 10, filterDuplicates: true, @@ -33,7 +33,7 @@ export class TimeHistory { return oldItem.from === newItem.from && oldItem.to === newItem.to; }, }; - this.history = new PersistedLog('kibana.timepicker.timeHistory', historyOptions, store); + this.history = new PersistedLog('kibana.timepicker.timeHistory', historyOptions, storage); } add(time: TimeRange) { diff --git a/src/legacy/core_plugins/data/public/timefilter/timefilter_service.ts b/src/legacy/core_plugins/data/public/timefilter/timefilter_service.ts index cda9b93ef08aa..831ccebedc9cc 100644 --- a/src/legacy/core_plugins/data/public/timefilter/timefilter_service.ts +++ b/src/legacy/core_plugins/data/public/timefilter/timefilter_service.ts @@ -18,8 +18,8 @@ */ import { UiSettingsClientContract } from 'src/core/public'; +import { IStorageWrapper } from 'src/plugins/kibana_utils/public'; import { TimeHistory, Timefilter, TimeHistoryContract, TimefilterContract } from './index'; -import { Storage } from '../types'; /** * Filter Service @@ -28,16 +28,16 @@ import { Storage } from '../types'; export interface TimeFilterServiceDependencies { uiSettings: UiSettingsClientContract; - store: Storage; + storage: IStorageWrapper; } export class TimefilterService { - public setup({ uiSettings, store }: TimeFilterServiceDependencies): TimefilterSetup { + public setup({ uiSettings, storage }: TimeFilterServiceDependencies): TimefilterSetup { const timefilterConfig = { timeDefaults: uiSettings.get('timepicker:timeDefaults'), refreshIntervalDefaults: uiSettings.get('timepicker:refreshIntervalDefaults'), }; - const history = new TimeHistory(store); + const history = new TimeHistory(storage); const timefilter = new Timefilter(timefilterConfig, history); return { diff --git a/src/legacy/core_plugins/data/public/types.ts b/src/legacy/core_plugins/data/public/types.ts index 2c02a9b764755..b6c9c47cc0ae6 100644 --- a/src/legacy/core_plugins/data/public/types.ts +++ b/src/legacy/core_plugins/data/public/types.ts @@ -19,13 +19,7 @@ import { UiSettingsClientContract, CoreStart } from 'src/core/public'; import { DataPublicPluginStart } from 'src/plugins/data/public'; - -export interface Storage { - get: (key: string) => any; - set: (key: string, value: any) => void; - remove: (key: string) => any; - clear: () => void; -} +import { IStorageWrapper } from 'src/plugins/kibana_utils/public'; export interface IDataPluginServices extends Partial { appName: string; @@ -33,6 +27,6 @@ export interface IDataPluginServices extends Partial { savedObjects: CoreStart['savedObjects']; notifications: CoreStart['notifications']; http: CoreStart['http']; - store: Storage; + storage: IStorageWrapper; data: DataPublicPluginStart; } diff --git a/src/legacy/core_plugins/elasticsearch/index.js b/src/legacy/core_plugins/elasticsearch/index.js index ed6e2d7f7f1c8..f92f920d1afb7 100644 --- a/src/legacy/core_plugins/elasticsearch/index.js +++ b/src/legacy/core_plugins/elasticsearch/index.js @@ -98,10 +98,14 @@ export default function (kibana) { createProxy(server); // Set up the health check service and start it. - const { start, waitUntilReady } = healthCheck(this, server, esConfig.healthCheckDelay.asMilliseconds()); + const { start, waitUntilReady } = healthCheck( + this, + server, + esConfig.healthCheckDelay.asMilliseconds(), + esConfig.ignoreVersionMismatch + ); server.expose('waitUntilReady', waitUntilReady); start(); - } + }, }); - } diff --git a/src/legacy/core_plugins/elasticsearch/lib/__tests__/ensure_es_version.js b/src/legacy/core_plugins/elasticsearch/lib/__tests__/ensure_es_version.js index baf728262aad1..a31c7830f8d5c 100644 --- a/src/legacy/core_plugins/elasticsearch/lib/__tests__/ensure_es_version.js +++ b/src/legacy/core_plugins/elasticsearch/lib/__tests__/ensure_es_version.js @@ -105,6 +105,51 @@ describe('plugins/elasticsearch', () => { } }); + it('does not throw on outdated nodes, if `ignoreVersionMismatch` is enabled in development mode', async () => { + // set config values + server.config = () => ({ + get: name => { + switch (name) { + case 'env.dev': + return true; + default: + throw new Error(`Unknown option "${name}"`); + } + }, + }); + + // 5.0.0 ES is too old to work with a 5.1.0 version of Kibana. + setNodes('5.1.0', '5.2.0', '5.0.0'); + + const ignoreVersionMismatch = true; + const result = await ensureEsVersion(server, KIBANA_VERSION, ignoreVersionMismatch); + expect(result).to.be(true); + }); + + it('throws an error if `ignoreVersionMismatch` is enabled in production mode', async () => { + // set config values + server.config = () => ({ + get: name => { + switch (name) { + case 'env.dev': + return false; + default: + throw new Error(`Unknown option "${name}"`); + } + }, + }); + + // 5.0.0 ES is too old to work with a 5.1.0 version of Kibana. + setNodes('5.1.0', '5.2.0', '5.0.0'); + + try { + const ignoreVersionMismatch = true; + await ensureEsVersion(server, KIBANA_VERSION, ignoreVersionMismatch); + } catch (e) { + expect(e).to.be.a(Error); + } + }); + it('fails if that single node is a client node', async () => { setNodes( '5.1.0', diff --git a/src/legacy/core_plugins/elasticsearch/lib/ensure_es_version.js b/src/legacy/core_plugins/elasticsearch/lib/ensure_es_version.js index 95c7db36d5fb4..cb3ed1886b4a1 100644 --- a/src/legacy/core_plugins/elasticsearch/lib/ensure_es_version.js +++ b/src/legacy/core_plugins/elasticsearch/lib/ensure_es_version.js @@ -36,7 +36,7 @@ import isEsCompatibleWithKibana from './is_es_compatible_with_kibana'; */ const lastWarnedNodesForServer = new WeakMap(); -export function ensureEsVersion(server, kibanaVersion) { +export function ensureEsVersion(server, kibanaVersion, ignoreVersionMismatch = false) { const { callWithInternalUser } = server.plugins.elasticsearch.getCluster('admin'); server.logWithMetadata(['plugin', 'debug'], 'Checking Elasticsearch version'); @@ -102,7 +102,7 @@ export function ensureEsVersion(server, kibanaVersion) { } } - if (incompatibleNodes.length) { + if (incompatibleNodes.length && !shouldIgnoreVersionMismatch(server, ignoreVersionMismatch)) { const incompatibleNodeNames = getHumanizedNodeNames(incompatibleNodes); throw new Error( `This version of Kibana requires Elasticsearch v` + @@ -114,3 +114,12 @@ export function ensureEsVersion(server, kibanaVersion) { return true; }); } + +function shouldIgnoreVersionMismatch(server, ignoreVersionMismatch) { + const isDevMode = server.config().get('env.dev'); + if(!isDevMode && ignoreVersionMismatch) { + throw new Error(`Option "elasticsearch.ignoreVersionMismatch" can only be used in development mode`); + } + + return isDevMode && ignoreVersionMismatch; +} diff --git a/src/legacy/core_plugins/elasticsearch/lib/health_check.js b/src/legacy/core_plugins/elasticsearch/lib/health_check.js index 1b05d51b02494..ac8e6caab9496 100644 --- a/src/legacy/core_plugins/elasticsearch/lib/health_check.js +++ b/src/legacy/core_plugins/elasticsearch/lib/health_check.js @@ -21,7 +21,7 @@ import Bluebird from 'bluebird'; import kibanaVersion from './kibana_version'; import { ensureEsVersion } from './ensure_es_version'; -export default function (plugin, server, requestDelay) { +export default function (plugin, server, requestDelay, ignoreVersionMismatch) { plugin.status.yellow('Waiting for Elasticsearch'); function waitUntilReady() { @@ -31,7 +31,7 @@ export default function (plugin, server, requestDelay) { } function check() { - return ensureEsVersion(server, kibanaVersion.get()) + return ensureEsVersion(server, kibanaVersion.get(), ignoreVersionMismatch) .then(() => plugin.status.green('Ready')) .catch(err => plugin.status.red(err)); } diff --git a/src/legacy/core_plugins/embeddable_api/public/index.scss b/src/legacy/core_plugins/embeddable_api/public/index.scss index b4e170e6cb65c..3f1977b909c31 100644 --- a/src/legacy/core_plugins/embeddable_api/public/index.scss +++ b/src/legacy/core_plugins/embeddable_api/public/index.scss @@ -1,5 +1,3 @@ @import 'src/legacy/ui/public/styles/styling_constants'; -@import './variables'; -@import '../../../../plugins/embeddable/public/lib/panel/index'; -@import '../../../../plugins/embeddable/public/lib/panel/panel_header/index'; +@import '../../../../plugins/embeddable/public/index'; diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/expression_renderer.tsx b/src/legacy/core_plugins/expressions/public/np_ready/public/expression_renderer.tsx index 8359663610f29..208bdbe5d0288 100644 --- a/src/legacy/core_plugins/expressions/public/np_ready/public/expression_renderer.tsx +++ b/src/legacy/core_plugins/expressions/public/np_ready/public/expression_renderer.tsx @@ -21,7 +21,7 @@ import { useRef, useEffect, useState } from 'react'; import React from 'react'; import classNames from 'classnames'; import { EuiLoadingChart, EuiProgress } from '@elastic/eui'; -import { ExpressionAST, IExpressionLoaderParams, IInterpreterErrorResult } from './types'; +import { ExpressionAST, IExpressionLoaderParams } from './types'; import { ExpressionLoader } from './loader'; // Accept all options of the runner as props except for the @@ -35,7 +35,7 @@ export interface ExpressionRendererProps extends IExpressionLoaderParams { interface State { isEmpty: boolean; isLoading: boolean; - error: null | Error; + error: null | { message: string }; } export type ExpressionRenderer = React.FC; @@ -57,6 +57,7 @@ export const ExpressionRendererImplementation = ({ const [state, setState] = useState({ ...defaultState }); // Re-fetch data automatically when the inputs change + /* eslint-disable react-hooks/exhaustive-deps */ useEffect(() => { if (handlerRef.current) { handlerRef.current.update(expression, options); @@ -68,6 +69,7 @@ export const ExpressionRendererImplementation = ({ options.variables, options.disableCaching, ]); + /* eslint-enable react-hooks/exhaustive-deps */ // Initialize the loader only once useEffect(() => { @@ -80,7 +82,7 @@ export const ExpressionRendererImplementation = ({ } setState(prevState => ({ ...prevState, isLoading: true })); }); - handlerRef.current.render$.subscribe((item: number | IInterpreterErrorResult) => { + handlerRef.current.render$.subscribe(item => { if (!handlerRef.current) { return; } diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/loader.test.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/loader.test.ts index 36917bf4e8384..a3caa1c47b150 100644 --- a/src/legacy/core_plugins/expressions/public/np_ready/public/loader.test.ts +++ b/src/legacy/core_plugins/expressions/public/np_ready/public/loader.test.ts @@ -23,7 +23,7 @@ import { ExpressionDataHandler } from './execute'; import { fromExpression } from '@kbn/interpreter/common'; import { IInterpreterRenderHandlers } from './types'; import { Observable } from 'rxjs'; -import { ExpressionAST } from '../../../../../../plugins/expressions/common'; +import { ExpressionAST } from '../../../../../../plugins/expressions/public'; const element: HTMLElement = null as any; diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/mocks.tsx b/src/legacy/core_plugins/expressions/public/np_ready/public/mocks.tsx index 1a2f473f4c9a1..b17cd454b65ea 100644 --- a/src/legacy/core_plugins/expressions/public/np_ready/public/mocks.tsx +++ b/src/legacy/core_plugins/expressions/public/np_ready/public/mocks.tsx @@ -39,6 +39,11 @@ const createExpressionsSetupMock = (): ExpressionsSetup => { types: { register: () => {}, } as any, + getExecutor: () => ({ + interpreter: { + interpretAst: () => {}, + }, + }), }, }; }; diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/plugin.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/plugin.ts index ec70248694990..d2c6c14c17de1 100644 --- a/src/legacy/core_plugins/expressions/public/np_ready/public/plugin.ts +++ b/src/legacy/core_plugins/expressions/public/np_ready/public/plugin.ts @@ -19,9 +19,10 @@ /* eslint-disable */ import { npSetup } from 'ui/new_platform'; -import { ExpressionsSetupContract } from '../../../../../../plugins/expressions/public/expressions/expressions_service'; /* eslint-enable */ +import { ExpressionsSetup } from '../../../../../../plugins/expressions/public'; + import { CoreSetup, CoreStart, @@ -32,7 +33,7 @@ import { Start as InspectorStart, Setup as InspectorSetup, } from '../../../../../../plugins/inspector/public'; -import { IInterpreter } from './types'; +import { ExpressionInterpreter } from './types'; import { setInterpreter, setInspector, setRenderersRegistry } from './services'; import { ExpressionRendererImplementation } from './expression_renderer'; import { ExpressionLoader, loader } from './loader'; @@ -47,7 +48,7 @@ export interface ExpressionsStartDeps { inspector: InspectorStart; } -export type ExpressionsSetup = ExpressionsSetupContract; +export { ExpressionsSetup }; export type ExpressionsStart = ReturnType; export class ExpressionsPublicPlugin @@ -61,7 +62,7 @@ export class ExpressionsPublicPlugin // eslint-disable-next-line const { getInterpreter } = require('../../../../interpreter/public/interpreter'); getInterpreter() - .then(({ interpreter }: { interpreter: IInterpreter }) => { + .then(({ interpreter }: { interpreter: ExpressionInterpreter }) => { setInterpreter(interpreter); }) .catch((e: Error) => { diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/render.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/render.ts index f67b4c2d8e272..8475325a2c625 100644 --- a/src/legacy/core_plugins/expressions/public/np_ready/public/render.ts +++ b/src/legacy/core_plugins/expressions/public/np_ready/public/render.ts @@ -23,17 +23,22 @@ import { share } from 'rxjs/operators'; import { event, RenderId, Data, IInterpreterRenderHandlers } from './types'; import { getRenderersRegistry } from './services'; +interface RenderError { + type: 'error'; + error: { type?: string; message: string }; +} + export type IExpressionRendererExtraHandlers = Record; export class ExpressionRenderHandler { - render$: Observable; + render$: Observable; update$: Observable; events$: Observable; private element: HTMLElement; private destroyFn?: any; private renderCount: number = 0; - private renderSubject: Rx.Subject; + private renderSubject: Rx.Subject; private eventsSubject: Rx.Subject; private updateSubject: Rx.Subject; private handlers: IInterpreterRenderHandlers; @@ -104,7 +109,7 @@ export class ExpressionRenderHandler { try { // Rendering is asynchronous, completed by handlers.done() getRenderersRegistry() - .get(data.as) + .get(data.as)! .render(this.element, data.value, { ...this.handlers, ...extraHandlers }); } catch (e) { this.renderSubject.next({ diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/services.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/services.ts index ae2a7955233d1..5c357b5dcd2bb 100644 --- a/src/legacy/core_plugins/expressions/public/np_ready/public/services.ts +++ b/src/legacy/core_plugins/expressions/public/np_ready/public/services.ts @@ -17,13 +17,15 @@ * under the License. */ +import { ExpressionInterpreter } from './types'; import { createGetterSetter } from '../../../../../../plugins/kibana_utils/public'; -import { IInterpreter } from './types'; import { Start as IInspector } from '../../../../../../plugins/inspector/public'; import { ExpressionsSetup } from './plugin'; export const [getInspector, setInspector] = createGetterSetter('Inspector'); -export const [getInterpreter, setInterpreter] = createGetterSetter('Interpreter'); +export const [getInterpreter, setInterpreter] = createGetterSetter( + 'Interpreter' +); export const [getRenderersRegistry, setRenderersRegistry] = createGetterSetter< ExpressionsSetup['__LEGACY']['renderers'] >('Renderers registry'); diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/types.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/types.ts index 0390440298c55..9d7b4fb6d0480 100644 --- a/src/legacy/core_plugins/expressions/public/np_ready/public/types.ts +++ b/src/legacy/core_plugins/expressions/public/np_ready/public/types.ts @@ -17,80 +17,9 @@ * under the License. */ -import { Filter } from '@kbn/es-query'; import { TimeRange } from '../../../../../../plugins/data/public'; import { Adapters } from '../../../../../../plugins/inspector/public'; import { Query } from '../../../../../../plugins/data/public'; -import { ExpressionAST } from '../../../../../../plugins/expressions/common'; -export { ExpressionAST, TimeRange, Adapters, Filter, Query }; - -export type RenderId = number; -export type Data = any; -export type event = any; -export type Context = object; - -export interface SearchContext { - type: 'kibana_context'; - filters?: Filter[]; - query?: Query; - timeRange?: TimeRange; -} - -export type IGetInitialContext = () => SearchContext | Context; - -export interface IExpressionLoaderParams { - searchContext?: SearchContext; - context?: Context; - variables?: Record; - disableCaching?: boolean; - customFunctions?: []; - customRenderers?: []; - extraHandlers?: Record; -} - -export interface IInterpreterHandlers { - getInitialContext: IGetInitialContext; - inspectorAdapters?: Adapters; - abortSignal?: AbortSignal; -} - -export interface IInterpreterErrorResult { - type: 'error'; - error: { message: string; name: string; stack: string }; -} - -export interface IInterpreterSuccessResult { - type: string; - as?: string; - value?: unknown; - error?: unknown; -} - -export type IInterpreterResult = IInterpreterSuccessResult & IInterpreterErrorResult; - -export interface IInterpreterRenderHandlers { - // Done increments the number of rendering successes - done: () => void; - onDestroy: (fn: () => void) => void; - reload: () => void; - update: (params: any) => void; - event: (event: event) => void; -} - -export interface IInterpreterRenderFunction { - name: string; - displayName: string; - help: string; - validate: () => void; - reuseDomNode: boolean; - render: (domNode: Element, data: T, handlers: IInterpreterRenderHandlers) => void | Promise; -} - -export interface IInterpreter { - interpretAst( - ast: ExpressionAST, - context: Context, - handlers: IInterpreterHandlers - ): Promise; -} +export { TimeRange, Adapters, Query }; +export * from '../../../../../../plugins/expressions/public'; diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.js b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.js index 9f0ed1dfb5097..65b1d41fa8239 100644 --- a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.js +++ b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.js @@ -20,12 +20,8 @@ import _ from 'lodash'; import { FilterManager } from './filter_manager.js'; import { - buildPhraseFilter, - buildPhrasesFilter, - getPhraseFilterField, - getPhraseFilterValue, - isPhraseFilter, -} from '@kbn/es-query'; + esFilters, +} from '../../../../../../plugins/data/public'; export class PhraseFilterManager extends FilterManager { constructor(controlId, fieldName, indexPattern, queryFilter) { @@ -43,12 +39,12 @@ export class PhraseFilterManager extends FilterManager { createFilter(phrases) { let newFilter; if (phrases.length === 1) { - newFilter = buildPhraseFilter( + newFilter = esFilters.buildPhraseFilter( this.indexPattern.fields.getByName(this.fieldName), phrases[0], this.indexPattern); } else { - newFilter = buildPhrasesFilter( + newFilter = esFilters.buildPhrasesFilter( this.indexPattern.fields.getByName(this.fieldName), phrases, this.indexPattern); @@ -107,12 +103,12 @@ export class PhraseFilterManager extends FilterManager { } // single phrase filter - if (isPhraseFilter(kbnFilter)) { - if (getPhraseFilterField(kbnFilter) !== this.fieldName) { + if (esFilters.isPhraseFilter(kbnFilter)) { + if (esFilters.getPhraseFilterField(kbnFilter) !== this.fieldName) { return; } - return getPhraseFilterValue(kbnFilter); + return esFilters.getPhraseFilterValue(kbnFilter); } // single phrase filter from bool filter diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.js b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.js index 1c8f5e2aa5a3e..3a232fd8b543d 100644 --- a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.js +++ b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.js @@ -19,7 +19,7 @@ import _ from 'lodash'; import { FilterManager } from './filter_manager.js'; -import { buildRangeFilter } from '@kbn/es-query'; +import { esFilters } from '../../../../../../plugins/data/public'; // Convert slider value into ES range filter function toRange(sliderValue) { @@ -55,7 +55,7 @@ export class RangeFilterManager extends FilterManager { * @return {object} range filter */ createFilter(value) { - const newFilter = buildRangeFilter( + const newFilter = esFilters.buildRangeFilter( this.indexPattern.fields.getByName(this.fieldName), toRange(value), this.indexPattern); diff --git a/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.js b/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.js index 44c68c84579c6..86fe6db9b0778 100644 --- a/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.js +++ b/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.js @@ -26,6 +26,7 @@ import { import { PhraseFilterManager } from './filter_manager/phrase_filter_manager'; import { createSearchSource } from './create_search_source'; import { i18n } from '@kbn/i18n'; +import { npStart } from 'ui/new_platform'; import chrome from 'ui/chrome'; import { start as data } from '../../../../core_plugins/data/public/legacy'; @@ -187,9 +188,10 @@ export async function listControlFactory(controlParams, useTimeFilter, SearchSou // ignore not found error and return control so it can be displayed in disabled state. } + const { filterManager } = npStart.plugins.data.query; return new ListControl( controlParams, - new PhraseFilterManager(controlParams.id, controlParams.fieldName, indexPattern, data.filter.filterManager), + new PhraseFilterManager(controlParams.id, controlParams.fieldName, indexPattern, filterManager), useTimeFilter, SearchSource, ); diff --git a/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.test.js b/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.test.js index d5c23c2c1c855..b40a9f8e6efd4 100644 --- a/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.test.js +++ b/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.test.js @@ -24,6 +24,28 @@ jest.mock('ui/timefilter', () => ({ createFilter: jest.fn(), })); +jest.mock('ui/new_platform', () => ({ + npStart: { + plugins: { + data: { + query: { + filterManager: { + fieldName: 'myNumberField', + getIndexPattern: () => ({ + fields: { getByName: name => { + const fields = { myField: { name: 'myField' } }; + return fields[name]; + } } + }), + getAppFilters: jest.fn().mockImplementation(() => ([])), + getGlobalFilters: jest.fn().mockImplementation(() => ([])), + } + } + } + }, + }, +})); + jest.mock('../../../../core_plugins/data/public/legacy', () => ({ start: { indexPatterns: { @@ -36,19 +58,6 @@ jest.mock('../../../../core_plugins/data/public/legacy', () => ({ }), } }, - filter: { - filterManager: { - fieldName: 'myNumberField', - getIndexPattern: () => ({ - fields: { getByName: name => { - const fields = { myField: { name: 'myField' } }; - return fields[name]; - } } - }), - getAppFilters: jest.fn().mockImplementation(() => ([])), - getGlobalFilters: jest.fn().mockImplementation(() => ([])), - } - } } })); diff --git a/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.js b/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.js index efb208bd80045..2a05a1224aab9 100644 --- a/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.js +++ b/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.js @@ -27,6 +27,7 @@ import { RangeFilterManager } from './filter_manager/range_filter_manager'; import { createSearchSource } from './create_search_source'; import { i18n } from '@kbn/i18n'; import { start as data } from '../../../../core_plugins/data/public/legacy'; +import { npStart } from 'ui/new_platform'; const minMaxAgg = (field) => { const aggBody = {}; @@ -106,9 +107,10 @@ export async function rangeControlFactory(controlParams, useTimeFilter, SearchSo } catch (err) { // ignore not found error and return control so it can be displayed in disabled state. } + const { filterManager } = npStart.plugins.data.query; return new RangeControl( controlParams, - new RangeFilterManager(controlParams.id, controlParams.fieldName, indexPattern, data.filter.filterManager), + new RangeFilterManager(controlParams.id, controlParams.fieldName, indexPattern, filterManager), useTimeFilter, SearchSource, ); diff --git a/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.test.js b/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.test.js index c746d116c70b2..3e6d6a49a1118 100644 --- a/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.test.js +++ b/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.test.js @@ -32,6 +32,28 @@ jest.mock('ui/timefilter', () => ({ createFilter: jest.fn(), })); +jest.mock('ui/new_platform', () => ({ + npStart: { + plugins: { + data: { + query: { + filterManager: { + fieldName: 'myNumberField', + getIndexPattern: () => ({ + fields: { getByName: name => { + const fields = { myNumberField: { name: 'myNumberField' } }; + return fields[name]; + } + } }), + getAppFilters: jest.fn().mockImplementation(() => ([])), + getGlobalFilters: jest.fn().mockImplementation(() => ([])), + } + } + } + }, + }, +})); + jest.mock('../../../../core_plugins/data/public/legacy', () => ({ start: { indexPatterns: { @@ -44,19 +66,6 @@ jest.mock('../../../../core_plugins/data/public/legacy', () => ({ } }), } }, - filter: { - filterManager: { - fieldName: 'myNumberField', - getIndexPattern: () => ({ - fields: { getByName: name => { - const fields = { myNumberField: { name: 'myNumberField' } }; - return fields[name]; - } - } }), - getAppFilters: jest.fn().mockImplementation(() => ([])), - getGlobalFilters: jest.fn().mockImplementation(() => ([])), - } - } } })); diff --git a/src/legacy/core_plugins/input_control_vis/public/vis_controller.js b/src/legacy/core_plugins/input_control_vis/public/vis_controller.js index 1edf5652a76c5..792ff3fe85479 100644 --- a/src/legacy/core_plugins/input_control_vis/public/vis_controller.js +++ b/src/legacy/core_plugins/input_control_vis/public/vis_controller.js @@ -23,7 +23,7 @@ import { I18nContext } from 'ui/i18n'; import { InputControlVis } from './components/vis/input_control_vis'; import { controlFactory } from './control/control_factory'; import { getLineageMap } from './lineage'; -import { start as data } from '../../../core_plugins/data/public/legacy'; +import { npStart } from 'ui/new_platform'; import { SearchSource } from '../../../ui/public/courier/search_source/search_source'; class VisController { @@ -34,7 +34,7 @@ class VisController { this.queryBarUpdateHandler = this.updateControlsFromKbn.bind(this); - this.filterManager = data.filter.filterManager; + this.filterManager = npStart.plugins.data.query.filterManager; this.updateSubsciption = this.filterManager.getUpdates$() .subscribe(this.queryBarUpdateHandler); } diff --git a/src/legacy/core_plugins/interpreter/common/index.ts b/src/legacy/core_plugins/interpreter/common/index.ts index 0251faa69fccf..8a54741e9d3e1 100644 --- a/src/legacy/core_plugins/interpreter/common/index.ts +++ b/src/legacy/core_plugins/interpreter/common/index.ts @@ -36,7 +36,8 @@ export { PointSeriesColumn, PointSeriesColumnName, Render, + ExpressionTypeStyle, Style, Type, -} from '../../../../plugins/expressions/common'; +} from '../../../../plugins/expressions/public'; export const API_ROUTE = '/api/interpreter'; diff --git a/src/legacy/core_plugins/interpreter/common/lib/fonts.ts b/src/legacy/core_plugins/interpreter/common/lib/fonts.ts index cdf3d4c16f3b5..1594f42abf2eb 100644 --- a/src/legacy/core_plugins/interpreter/common/lib/fonts.ts +++ b/src/legacy/core_plugins/interpreter/common/lib/fonts.ts @@ -17,135 +17,5 @@ * under the License. */ -/** - * This type contains a unions of all supported font labels, or the the name of - * the font the user would see in a UI. - */ -export type FontLabel = typeof fonts[number]['label']; - -/** - * This type contains a union of all supported font values, equivalent to the CSS - * `font-value` property. - */ -export type FontValue = typeof fonts[number]['value']; - -/** - * An interface representing a font in Canvas, with a textual label and the CSS - * `font-value`. - */ -export interface Font { - label: FontLabel; - value: FontValue; -} - -// This function allows one to create a strongly-typed font for inclusion in -// the font collection. As a result, the values and labels are known to the -// type system, preventing one from specifying a non-existent font at build -// time. -function createFont< - RawFont extends { value: RawFontValue; label: RawFontLabel }, - RawFontValue extends string, - RawFontLabel extends string ->(font: RawFont) { - return font; -} - -export const americanTypewriter = createFont({ - label: 'American Typewriter', - value: "'American Typewriter', 'Courier New', Courier, Monaco, mono", -}); - -export const arial = createFont({ label: 'Arial', value: 'Arial, sans-serif' }); - -export const baskerville = createFont({ - label: 'Baskerville', - value: "Baskerville, Georgia, Garamond, 'Times New Roman', Times, serif", -}); - -export const bookAntiqua = createFont({ - label: 'Book Antiqua', - value: "'Book Antiqua', Georgia, Garamond, 'Times New Roman', Times, serif", -}); - -export const brushScript = createFont({ - label: 'Brush Script', - value: "'Brush Script MT', 'Comic Sans', sans-serif", -}); - -export const chalkboard = createFont({ - label: 'Chalkboard', - value: "Chalkboard, 'Comic Sans', sans-serif", -}); - -export const didot = createFont({ - label: 'Didot', - value: "Didot, Georgia, Garamond, 'Times New Roman', Times, serif", -}); - -export const futura = createFont({ - label: 'Futura', - value: 'Futura, Impact, Helvetica, Arial, sans-serif', -}); - -export const gillSans = createFont({ - label: 'Gill Sans', - value: - "'Gill Sans', 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Helvetica, Arial, sans-serif", -}); - -export const helveticaNeue = createFont({ - label: 'Helvetica Neue', - value: "'Helvetica Neue', Helvetica, Arial, sans-serif", -}); - -export const hoeflerText = createFont({ - label: 'Hoefler Text', - value: "'Hoefler Text', Garamond, Georgia, 'Times New Roman', Times, serif", -}); - -export const lucidaGrande = createFont({ - label: 'Lucida Grande', - value: "'Lucida Grande', 'Lucida Sans Unicode', Lucida, Verdana, Helvetica, Arial, sans-serif", -}); - -export const myriad = createFont({ - label: 'Myriad', - value: 'Myriad, Helvetica, Arial, sans-serif', -}); - -export const openSans = createFont({ - label: 'Open Sans', - value: "'Open Sans', Helvetica, Arial, sans-serif", -}); - -export const optima = createFont({ - label: 'Optima', - value: "Optima, 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Helvetica, Arial, sans-serif", -}); - -export const palatino = createFont({ - label: 'Palatino', - value: "Palatino, 'Book Antiqua', Georgia, Garamond, 'Times New Roman', Times, serif", -}); - -/** - * A collection of supported fonts. - */ -export const fonts = [ - americanTypewriter, - arial, - baskerville, - bookAntiqua, - brushScript, - chalkboard, - didot, - futura, - gillSans, - helveticaNeue, - hoeflerText, - lucidaGrande, - myriad, - openSans, - optima, - palatino, -]; +// eslint-disable-next-line +export * from '../../../../../plugins/expressions/public/fonts'; diff --git a/src/legacy/core_plugins/interpreter/init.ts b/src/legacy/core_plugins/interpreter/init.ts index fc93346f28024..f09ffd4697e74 100644 --- a/src/legacy/core_plugins/interpreter/init.ts +++ b/src/legacy/core_plugins/interpreter/init.ts @@ -25,7 +25,7 @@ import { register, registryFactory, Registry, Fn } from '@kbn/interpreter/common // @ts-ignore import { routes } from './server/routes'; -import { typeSpecs as types } from '../../../plugins/expressions/common'; +import { typeSpecs as types } from '../../../plugins/expressions/public'; import { Type } from './common'; import { Legacy } from '../../../../kibana'; diff --git a/src/legacy/core_plugins/interpreter/public/functions/clog.ts b/src/legacy/core_plugins/interpreter/public/functions/clog.ts index 586584b498ac7..65362fe363374 100644 --- a/src/legacy/core_plugins/interpreter/public/functions/clog.ts +++ b/src/legacy/core_plugins/interpreter/public/functions/clog.ts @@ -17,19 +17,5 @@ * under the License. */ -import { ExpressionFunction } from '../../types'; - -const name = 'clog'; - -type Context = any; -type ClogExpressionFunction = ExpressionFunction; - -export const clog = (): ClogExpressionFunction => ({ - name, - args: {}, - help: 'Outputs the context to the console', - fn: context => { - console.log(context); // eslint-disable-line no-console - return context; - }, -}); +// eslint-disable-next-line +export * from '../../../../../plugins/expressions/public/functions/clog'; diff --git a/src/legacy/core_plugins/interpreter/public/functions/esaggs.ts b/src/legacy/core_plugins/interpreter/public/functions/esaggs.ts index 6fcfde0a5b06b..d232a97c3c34c 100644 --- a/src/legacy/core_plugins/interpreter/public/functions/esaggs.ts +++ b/src/legacy/core_plugins/interpreter/public/functions/esaggs.ts @@ -19,18 +19,12 @@ import { get, has } from 'lodash'; import { i18n } from '@kbn/i18n'; -// @ts-ignore import { AggConfigs } from 'ui/agg_types/agg_configs'; import { createFormat } from 'ui/visualize/loader/pipeline_helpers/utilities'; import chrome from 'ui/chrome'; - -// need to get rid of angular from these -// @ts-ignore import { TimeRange } from 'src/plugins/data/public'; import { SearchSource } from '../../../../ui/public/courier/search_source'; -// @ts-ignore import { FilterBarQueryFilterProvider } from '../../../../ui/public/filter_manager/query_filter'; - import { buildTabularInspectorData } from '../../../../ui/public/inspector/build_tabular_inspector_data'; import { getRequestInspectorStats, @@ -39,12 +33,15 @@ import { import { calculateObjectHash } from '../../../../ui/public/vis/lib/calculate_object_hash'; import { getTime } from '../../../../ui/public/timefilter'; import { RequestHandlerParams } from '../../../../ui/public/visualize/loader/embedded_visualize_handler'; -// @ts-ignore -import { tabifyAggResponse } from '../../../../ui/public/agg_response/tabify/tabify'; import { KibanaContext, KibanaDatatable } from '../../common'; import { ExpressionFunction, KibanaDatatableColumn } from '../../types'; import { start as data } from '../../../data/public/legacy'; +// @ts-ignore +import { tabifyAggResponse } from '../../../../ui/public/agg_response/tabify/tabify'; +// @ts-ignore +import { SearchSourceProvider } from '../../../../ui/public/courier/search_source'; + const name = 'esaggs'; type Context = KibanaContext | null; diff --git a/src/legacy/core_plugins/interpreter/public/functions/font.ts b/src/legacy/core_plugins/interpreter/public/functions/font.ts index 5cd5add318e26..2f3bc1ff37e2c 100644 --- a/src/legacy/core_plugins/interpreter/public/functions/font.ts +++ b/src/legacy/core_plugins/interpreter/public/functions/font.ts @@ -17,161 +17,5 @@ * under the License. */ -// @ts-ignore no @typed def -import inlineStyle from 'inline-style'; -import { i18n } from '@kbn/i18n'; -import { openSans } from '../../common/lib/fonts'; -import { ExpressionFunction } from '../../types'; -import { - CSSStyle, - FontFamily, - FontStyle, - FontWeight, - Style, - TextAlignment, - TextDecoration, -} from '../types'; - -interface Arguments { - align?: TextAlignment; - color?: string; - family?: FontFamily; - italic?: boolean; - lHeight?: number | null; - size?: number; - underline?: boolean; - weight?: FontWeight; -} - -export function font(): ExpressionFunction<'font', null, Arguments, Style> { - return { - name: 'font', - aliases: [], - type: 'style', - help: i18n.translate('interpreter.functions.fontHelpText', { - defaultMessage: 'Create a font style.', - }), - context: { - types: ['null'], - }, - args: { - align: { - default: 'left', - help: i18n.translate('interpreter.functions.font.args.alignHelpText', { - defaultMessage: 'The horizontal text alignment.', - }), - options: Object.values(TextAlignment), - types: ['string'], - }, - color: { - help: i18n.translate('interpreter.functions.font.args.colorHelpText', { - defaultMessage: 'The text color.', - }), - types: ['string'], - }, - family: { - default: `"${openSans.value}"`, - help: i18n.translate('interpreter.functions.font.args.familyHelpText', { - defaultMessage: 'An acceptable {css} web font string', - values: { - css: 'CSS', - }, - }), - types: ['string'], - }, - italic: { - default: false, - help: i18n.translate('interpreter.functions.font.args.italicHelpText', { - defaultMessage: 'Italicize the text?', - }), - options: [true, false], - types: ['boolean'], - }, - lHeight: { - default: null, - aliases: ['lineHeight'], - help: i18n.translate('interpreter.functions.font.args.lHeightHelpText', { - defaultMessage: 'The line height in pixels', - }), - types: ['number', 'null'], - }, - size: { - default: 14, - help: i18n.translate('interpreter.functions.font.args.sizeHelpText', { - defaultMessage: 'The font size in pixels', - }), - types: ['number'], - }, - underline: { - default: false, - help: i18n.translate('interpreter.functions.font.args.underlineHelpText', { - defaultMessage: 'Underline the text?', - }), - options: [true, false], - types: ['boolean'], - }, - weight: { - default: 'normal', - help: i18n.translate('interpreter.functions.font.args.weightHelpText', { - defaultMessage: 'The font weight. For example, {list}, or {end}.', - values: { - list: Object.values(FontWeight) - .slice(0, -1) - .map(weight => `\`"${weight}"\``) - .join(', '), - end: `\`"${Object.values(FontWeight).slice(-1)[0]}"\``, - }, - }), - options: Object.values(FontWeight), - types: ['string'], - }, - }, - fn: (_context, args) => { - if (!Object.values(FontWeight).includes(args.weight!)) { - throw new Error( - i18n.translate('interpreter.functions.font.invalidFontWeightErrorMessage', { - defaultMessage: "Invalid font weight: '{weight}'", - values: { - weight: args.weight, - }, - }) - ); - } - if (!Object.values(TextAlignment).includes(args.align!)) { - throw new Error( - i18n.translate('interpreter.functions.font.invalidTextAlignmentErrorMessage', { - defaultMessage: "Invalid text alignment: '{align}'", - values: { - align: args.align, - }, - }) - ); - } - - // the line height shouldn't ever be lower than the size, and apply as a - // pixel setting - const lineHeight = args.lHeight != null ? `${args.lHeight}px` : '1'; - - const spec: CSSStyle = { - fontFamily: args.family, - fontWeight: args.weight, - fontStyle: args.italic ? FontStyle.ITALIC : FontStyle.NORMAL, - textDecoration: args.underline ? TextDecoration.UNDERLINE : TextDecoration.NONE, - textAlign: args.align, - fontSize: `${args.size}px`, // apply font size as a pixel setting - lineHeight, // apply line height as a pixel setting - }; - - // conditionally apply styles based on input - if (args.color) { - spec.color = args.color; - } - - return { - type: 'style', - spec, - css: inlineStyle(spec), - }; - }, - }; -} +// eslint-disable-next-line +export * from '../../../../../plugins/expressions/public/functions/font'; diff --git a/src/legacy/core_plugins/interpreter/public/functions/index.ts b/src/legacy/core_plugins/interpreter/public/functions/index.ts deleted file mode 100644 index d86f033acb3d1..0000000000000 --- a/src/legacy/core_plugins/interpreter/public/functions/index.ts +++ /dev/null @@ -1,38 +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 { clog } from './clog'; -import { esaggs } from './esaggs'; -import { font } from './font'; -import { kibana } from './kibana'; -import { kibanaContext } from './kibana_context'; -import { range } from './range'; -import { visualization } from './visualization'; -import { visDimension } from './vis_dimension'; - -export const functions = [ - clog, - esaggs, - font, - kibana, - kibanaContext, - range, - visualization, - visDimension, -]; diff --git a/src/legacy/core_plugins/interpreter/public/functions/kibana.ts b/src/legacy/core_plugins/interpreter/public/functions/kibana.ts index c027b220ad0d0..7da284d9672a5 100644 --- a/src/legacy/core_plugins/interpreter/public/functions/kibana.ts +++ b/src/legacy/core_plugins/interpreter/public/functions/kibana.ts @@ -17,47 +17,5 @@ * under the License. */ -import { i18n } from '@kbn/i18n'; -import { ExpressionFunction, KibanaContext } from '../../types'; - -export type ExpressionFunctionKibana = ExpressionFunction< - 'kibana', - KibanaContext | null, - object, - KibanaContext ->; - -export const kibana = (): ExpressionFunctionKibana => ({ - name: 'kibana', - type: 'kibana_context', - - context: { - types: ['kibana_context', 'null'], - }, - - help: i18n.translate('interpreter.functions.kibana.help', { - defaultMessage: 'Gets kibana global context', - }), - args: {}, - fn(context, args, handlers) { - const initialContext = handlers.getInitialContext ? handlers.getInitialContext() : {}; - - if (context && context.query) { - initialContext.query = initialContext.query.concat(context.query); - } - - if (context && context.filters) { - initialContext.filters = initialContext.filters.concat(context.filters); - } - - const timeRange = initialContext.timeRange || (context ? context.timeRange : undefined); - - return { - ...context, - type: 'kibana_context', - query: initialContext.query, - filters: initialContext.filters, - timeRange, - }; - }, -}); +// eslint-disable-next-line +export * from '../../../../../plugins/expressions/public/functions/kibana'; diff --git a/src/legacy/core_plugins/interpreter/public/functions/range.ts b/src/legacy/core_plugins/interpreter/public/functions/range.ts index 8ae07dd82a22c..322bda983a8ff 100644 --- a/src/legacy/core_plugins/interpreter/public/functions/range.ts +++ b/src/legacy/core_plugins/interpreter/public/functions/range.ts @@ -17,48 +17,5 @@ * under the License. */ -import { i18n } from '@kbn/i18n'; -import { KibanaDatatable, Range } from '../../types'; -import { ExpressionFunction } from '../../types'; - -const name = 'range'; - -type Context = KibanaDatatable | null; - -interface Arguments { - from: number; - to: number; -} - -type Return = Range; // imported from type - -export const range = (): ExpressionFunction => ({ - name, - help: i18n.translate('interpreter.function.range.help', { - defaultMessage: 'Generates range object', - }), - type: 'range', - args: { - from: { - types: ['number'], - help: i18n.translate('interpreter.function.range.from.help', { - defaultMessage: 'Start of range', - }), - required: true, - }, - to: { - types: ['number'], - help: i18n.translate('interpreter.function.range.to.help', { - defaultMessage: 'End of range', - }), - required: true, - }, - }, - fn: (context, args) => { - return { - type: 'range', - from: args.from, - to: args.to, - }; - }, -}); +// eslint-disable-next-line +export * from '../../../../../plugins/visualizations/public/expression_functions/range'; diff --git a/src/legacy/core_plugins/interpreter/public/functions/vis_dimension.ts b/src/legacy/core_plugins/interpreter/public/functions/vis_dimension.ts index 4190a597b0120..d4ebeeb5267e1 100644 --- a/src/legacy/core_plugins/interpreter/public/functions/vis_dimension.ts +++ b/src/legacy/core_plugins/interpreter/public/functions/vis_dimension.ts @@ -17,73 +17,5 @@ * under the License. */ -import { i18n } from '@kbn/i18n'; -import { ExpressionFunction, KibanaDatatable } from '../../types'; - -const name = 'visdimension'; - -type Context = KibanaDatatable | null; - -interface Arguments { - accessor: string | number; - format?: string; - formatParams?: string; -} - -type Return = any; - -export const visDimension = (): ExpressionFunction => ({ - name: 'visdimension', - help: i18n.translate('interpreter.function.visDimension.help', { - defaultMessage: 'Generates visConfig dimension object', - }), - type: 'vis_dimension', - context: { - types: ['kibana_datatable'], - }, - args: { - accessor: { - types: ['string', 'number'], - aliases: ['_'], - help: i18n.translate('interpreter.function.visDimension.accessor.help', { - defaultMessage: 'Column in your dataset to use (either column index or column name)', - }), - }, - format: { - types: ['string'], - default: 'string', - help: i18n.translate('interpreter.function.visDimension.format.help', { - defaultMessage: 'Format', - }), - }, - formatParams: { - types: ['string'], - default: '"{}"', - help: i18n.translate('interpreter.function.visDimension.formatParams.help', { - defaultMessage: 'Format params', - }), - }, - }, - fn: (context, args) => { - const accessor = - typeof args.accessor === 'number' - ? args.accessor - : context!.columns.find(c => c.id === args.accessor); - if (accessor === undefined) { - throw new Error( - i18n.translate('interpreter.function.visDimension.error.accessor', { - defaultMessage: 'Column name provided is invalid', - }) - ); - } - - return { - type: 'vis_dimension', - accessor, - format: { - id: args.format, - params: JSON.parse(args.formatParams!), - }, - }; - }, -}); +// eslint-disable-next-line +export * from '../../../../../plugins/visualizations/public/expression_functions/vis_dimension'; diff --git a/src/legacy/core_plugins/interpreter/public/interpreter.test.ts b/src/legacy/core_plugins/interpreter/public/interpreter.test.ts deleted file mode 100644 index 429a943c3ff36..0000000000000 --- a/src/legacy/core_plugins/interpreter/public/interpreter.test.ts +++ /dev/null @@ -1,120 +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. - */ - -jest.mock('ui/new_platform', () => ({ - npSetup: { - core: { - http: {}, - injectedMetadata: { - getKibanaVersion: () => '8.0.0', - getBasePath: () => '/lol', - }, - }, - }, -})); -jest.mock('uiExports/interpreter'); - -jest.mock('@kbn/interpreter/common', () => ({ - register: jest.fn(), - registryFactory: jest.fn(), -})); - -const mockExecutor = { - interpreter: { - interpretAst: jest.fn(), - }, -}; -jest.mock('./lib/interpreter', () => ({ - initializeExecutor: jest.fn().mockReturnValue(Promise.resolve(mockExecutor)), -})); - -jest.mock('./registries', () => ({ - registries: { - browserFunctions: jest.fn(), - renderers: jest.fn(), - types: jest.fn(), - }, -})); - -jest.mock('../../../ui/public/new_platform'); -jest.mock('./functions', () => ({ functions: [{}, {}, {}] })); -jest.mock('./renderers/visualization', () => ({ visualization: {} })); - -describe('interpreter/interpreter', () => { - let getInterpreter: any; - let interpretAst: any; - let initializeExecutor: any; - - beforeEach(() => { - jest.clearAllMocks(); - jest.resetModules(); - getInterpreter = require('./interpreter').getInterpreter; - interpretAst = require('./interpreter').interpretAst; - initializeExecutor = require('./lib/interpreter').initializeExecutor; - }); - - describe('getInterpreter', () => { - it('initializes interpreter', async () => { - await getInterpreter(); - expect(initializeExecutor).toHaveBeenCalledTimes(1); - }); - - it('only initializes interpreter once', async () => { - await getInterpreter(); - await getInterpreter(); - expect(initializeExecutor).toHaveBeenCalledTimes(1); - }); - - it('resolves', async () => { - await expect(getInterpreter()).resolves; - }); - - it('resolves with interpreter object', async () => { - const interpreter = await getInterpreter(); - await expect(Object.keys(interpreter)).toEqual(['interpreter']); - }); - }); - - describe('interpretAst', () => { - it('resolves', async () => { - const params = [{}]; - await expect(interpretAst(...params)).resolves; - }); - - it('initializes interpreter if needed', async () => { - const params = [{}]; - await interpretAst(...params); - expect(initializeExecutor).toHaveBeenCalledTimes(1); - }); - - it('calls interpreter.interpretAst with the provided params', async () => { - const params = [{}]; - await interpretAst(...params); - expect(mockExecutor.interpreter.interpretAst).toHaveBeenCalledTimes(1); - expect(mockExecutor.interpreter.interpretAst).toHaveBeenCalledWith({}, undefined, undefined); - }); - - it('calls interpreter.interpretAst each time', async () => { - const params = [{}]; - await interpretAst(...params); - await interpretAst(...params); - expect(mockExecutor.interpreter.interpretAst).toHaveBeenCalledTimes(2); - }); - }); -}); diff --git a/src/legacy/core_plugins/interpreter/public/interpreter.ts b/src/legacy/core_plugins/interpreter/public/interpreter.ts index 1f0f8141345d2..a337f7e4ebfea 100644 --- a/src/legacy/core_plugins/interpreter/public/interpreter.ts +++ b/src/legacy/core_plugins/interpreter/public/interpreter.ts @@ -20,38 +20,42 @@ import 'uiExports/interpreter'; // @ts-ignore import { register, registryFactory } from '@kbn/interpreter/common'; -import { - initializeExecutor, - ExpressionExecutor, - ExpressionInterpretWithHandlers, -} from './lib/interpreter'; +import { npSetup } from 'ui/new_platform'; import { registries } from './registries'; -import { functions } from './functions'; import { visualization } from './renderers/visualization'; -import { typeSpecs } from '../../../../plugins/expressions/common'; +import { + ExpressionInterpretWithHandlers, + ExpressionExecutor, +} from '../../../../plugins/expressions/public'; +import { esaggs as esaggsFn } from './functions/esaggs'; +import { visualization as visualizationFn } from './functions/visualization'; // Expose kbnInterpreter.register(specs) and kbnInterpreter.registries() globally so that plugins // can register without a transpile step. +// TODO: This will be left behind in then legacy platform? (global as any).kbnInterpreter = Object.assign( (global as any).kbnInterpreter || {}, registryFactory(registries) ); -register(registries, { - types: typeSpecs, - browserFunctions: functions, - renderers: [visualization], -}); +// TODO: This needs to be moved to `data` plugin Search service. +registries.browserFunctions.register(esaggsFn); -let executorPromise: Promise | undefined; +// TODO: This needs to be moved to `visualizations` plugin. +registries.browserFunctions.register(visualizationFn); +registries.renderers.register(visualization); +// TODO: This function will be left behind in the legacy platform. +let executorPromise: Promise | undefined; export const getInterpreter = async () => { if (!executorPromise) { - executorPromise = initializeExecutor(); + const executor = npSetup.plugins.expressions.__LEGACY.getExecutor(); + executorPromise = Promise.resolve(executor); } return await executorPromise; }; +// TODO: This function will be left behind in the legacy platform. export const interpretAst: ExpressionInterpretWithHandlers = async (ast, context, handlers) => { const { interpreter } = await getInterpreter(); return await interpreter.interpretAst(ast, context, handlers); diff --git a/src/legacy/core_plugins/interpreter/public/lib/create_handlers.ts b/src/legacy/core_plugins/interpreter/public/lib/create_handlers.ts index 46e85411c5895..c14272fbf8def 100644 --- a/src/legacy/core_plugins/interpreter/public/lib/create_handlers.ts +++ b/src/legacy/core_plugins/interpreter/public/lib/create_handlers.ts @@ -17,8 +17,5 @@ * under the License. */ -export function createHandlers() { - return { - environment: 'client', - }; -} +// eslint-disable-next-line +export * from '../../../../../plugins/expressions/public/create_handlers'; diff --git a/src/legacy/core_plugins/interpreter/public/lib/interpreter.ts b/src/legacy/core_plugins/interpreter/public/lib/interpreter.ts deleted file mode 100644 index 399ecc5950268..0000000000000 --- a/src/legacy/core_plugins/interpreter/public/lib/interpreter.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 { ExpressionInterpret } from 'src/plugins/expressions/common/expressions/interpreter_provider'; -import { interpreterProvider } from '../../common'; -import { createHandlers } from './create_handlers'; -import { registries } from '../registries'; -import { FunctionHandlers } from '../../types'; - -export type ExpressionInterpretWithHandlers = ( - ast: Parameters[0], - context: Parameters[1], - handlers: FunctionHandlers -) => ReturnType; - -export interface ExpressionInterpreter { - interpretAst: ExpressionInterpretWithHandlers; -} - -export interface ExpressionExecutor { - interpreter: ExpressionInterpreter; -} - -export async function initializeExecutor(): Promise { - const interpretAst: ExpressionInterpretWithHandlers = async (ast, context, handlers) => { - const interpret = await interpreterProvider({ - types: registries.types.toJS(), - handlers: { ...handlers, ...createHandlers() }, - functions: registries.browserFunctions.toJS(), - }); - return interpret(ast, context); - }; - - return { interpreter: { interpretAst } }; -} diff --git a/src/legacy/core_plugins/interpreter/public/types/style.ts b/src/legacy/core_plugins/interpreter/public/types/style.ts index fd22b9bae2e95..7386048a4ae04 100644 --- a/src/legacy/core_plugins/interpreter/public/types/style.ts +++ b/src/legacy/core_plugins/interpreter/public/types/style.ts @@ -17,120 +17,10 @@ * under the License. */ -import { FontLabel } from '../../common/lib/fonts'; -export { FontLabel as FontFamily, FontValue } from '../../common/lib/fonts'; - -/** - * Enum of supported CSS `background-repeat` properties. - */ -export enum BackgroundRepeat { - REPEAT = 'repeat', - REPEAT_NO = 'no-repeat', - REPEAT_X = 'repeat-x', - REPEAT_Y = 'repeat-y', - ROUND = 'round', - SPACE = 'space', -} - -/** - * Enum of supported CSS `background-size` properties. - */ -export enum BackgroundSize { - AUTO = 'auto', - CONTAIN = 'contain', - COVER = 'cover', -} - -/** - * Enum of supported CSS `font-style` properties. - */ -export enum FontStyle { - ITALIC = 'italic', - NORMAL = 'normal', -} - -/** - * Enum of supported CSS `font-weight` properties. - */ -export enum FontWeight { - NORMAL = 'normal', - BOLD = 'bold', - BOLDER = 'bolder', - LIGHTER = 'lighter', - ONE = '100', - TWO = '200', - THREE = '300', - FOUR = '400', - FIVE = '500', - SIX = '600', - SEVEN = '700', - EIGHT = '800', - NINE = '900', -} - -/** - * Enum of supported CSS `overflow` properties. - */ -export enum Overflow { - AUTO = 'auto', - HIDDEN = 'hidden', - SCROLL = 'scroll', - VISIBLE = 'visible', -} - -/** - * Enum of supported CSS `text-align` properties. - */ -export enum TextAlignment { - CENTER = 'center', - JUSTIFY = 'justify', - LEFT = 'left', - RIGHT = 'right', -} - -/** - * Enum of supported CSS `text-decoration` properties. - */ -export enum TextDecoration { - NONE = 'none', - UNDERLINE = 'underline', -} - -/** - * Represents the various style properties that can be applied to an element. - */ -export interface CSSStyle { - color?: string; - fill?: string; - fontFamily?: FontLabel; - fontSize?: string; - fontStyle?: FontStyle; - fontWeight?: FontWeight; - lineHeight?: number | string; - textAlign?: TextAlignment; - textDecoration?: TextDecoration; -} - -/** - * Represents an object containing style information for a Container. - */ -export interface ContainerStyle { - border: string | null; - borderRadius: string | null; - padding: string | null; - backgroundColor: string | null; - backgroundImage: string | null; - backgroundSize: BackgroundSize; - backgroundRepeat: BackgroundRepeat; - opacity: number | null; - overflow: Overflow; -} - -/** - * An object that represents style information, typically CSS. - */ -export interface Style { - type: 'style'; - spec: CSSStyle; - css: string; -} +/* eslint-disable */ +export * from '../../../../../plugins/expressions/public/types/style'; +export { + FontLabel as FontFamily, + FontValue, +} from '../../../../../plugins/expressions/public/fonts'; +/* eslint-enable */ diff --git a/src/legacy/core_plugins/interpreter/test_helpers.ts b/src/legacy/core_plugins/interpreter/test_helpers.ts index 1f39a8271367c..0e34f42b01544 100644 --- a/src/legacy/core_plugins/interpreter/test_helpers.ts +++ b/src/legacy/core_plugins/interpreter/test_helpers.ts @@ -17,17 +17,5 @@ * under the License. */ -import { mapValues } from 'lodash'; -import { AnyExpressionFunction, FunctionHandlers } from './types'; - -// Takes a function spec and passes in default args, -// overriding with any provided args. -export const functionWrapper = (fnSpec: () => T) => { - const spec = fnSpec(); - const defaultArgs = mapValues(spec.args, argSpec => argSpec.default); - return ( - context: object | null, - args: Record = {}, - handlers: FunctionHandlers = {} - ) => spec.fn(context, { ...defaultArgs, ...args }, handlers); -}; +// eslint-disable-next-line +export * from '../../../plugins/expressions/public/functions/tests/utils'; diff --git a/src/legacy/core_plugins/interpreter/types/arguments.ts b/src/legacy/core_plugins/interpreter/types/arguments.ts index 3e17166a7c434..35566381d010d 100644 --- a/src/legacy/core_plugins/interpreter/types/arguments.ts +++ b/src/legacy/core_plugins/interpreter/types/arguments.ts @@ -17,4 +17,5 @@ * under the License. */ -export * from '../../../../plugins/expressions/common/expressions/types/arguments'; +// eslint-disable-next-line +export * from '../../../../plugins/expressions/public/types/arguments'; diff --git a/src/legacy/core_plugins/interpreter/types/common.ts b/src/legacy/core_plugins/interpreter/types/common.ts index dce984a0bd556..99a7d2dc92f06 100644 --- a/src/legacy/core_plugins/interpreter/types/common.ts +++ b/src/legacy/core_plugins/interpreter/types/common.ts @@ -17,4 +17,5 @@ * under the License. */ -export * from '../../../../plugins/expressions/common/expressions/types/common'; +// eslint-disable-next-line +export * from '../../../../plugins/expressions/public/types/common'; diff --git a/src/legacy/core_plugins/interpreter/types/functions.ts b/src/legacy/core_plugins/interpreter/types/functions.ts index 789bb29990cb4..9a99a78281a0c 100644 --- a/src/legacy/core_plugins/interpreter/types/functions.ts +++ b/src/legacy/core_plugins/interpreter/types/functions.ts @@ -17,4 +17,5 @@ * under the License. */ -export * from '../../../../plugins/expressions/common/expressions/types/functions'; +// eslint-disable-next-line +export * from '../../../../plugins/expressions/public/types/functions'; diff --git a/src/legacy/core_plugins/interpreter/types/index.ts b/src/legacy/core_plugins/interpreter/types/index.ts index c178bee26a7cd..6cefc47a678d4 100644 --- a/src/legacy/core_plugins/interpreter/types/index.ts +++ b/src/legacy/core_plugins/interpreter/types/index.ts @@ -17,4 +17,4 @@ * under the License. */ -export * from '../../../../plugins/expressions/common'; +export * from '../../../../plugins/expressions/public'; diff --git a/src/legacy/core_plugins/interpreter/types/types.ts b/src/legacy/core_plugins/interpreter/types/types.ts index d3f1cb3987b00..aacb63eaace0c 100644 --- a/src/legacy/core_plugins/interpreter/types/types.ts +++ b/src/legacy/core_plugins/interpreter/types/types.ts @@ -17,4 +17,5 @@ * under the License. */ -export * from '../../../../plugins/expressions/common/expressions/types'; +// eslint-disable-next-line +export * from '../../../../plugins/expressions/public/types'; diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row.tsx b/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row.tsx index 1d979f82d39d8..045e8093124a6 100644 --- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row.tsx +++ b/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row.tsx @@ -100,6 +100,7 @@ export function DocViewTableRow({ * Justification for dangerouslySetInnerHTML: * We just use values encoded by our field formatters */ + // eslint-disable-next-line react/no-danger dangerouslySetInnerHTML={{ __html: value as string }} /> diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/number_input.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/number_input.tsx index 282c2e6a356bf..b614e00ba8cd0 100644 --- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/number_input.tsx +++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/number_input.tsx @@ -34,6 +34,12 @@ interface NumberInputOptionProps { setValue: (paramName: ParamName, value: number | '') => void; } +/** + * Do not use this component anymore. + * Please, use NumberInputOption in 'required_number_input.tsx'. + * It is required for compatibility with TS 3.7.0 + * This should be removed in the future + */ function NumberInputOption({ disabled, error, diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/required_number_input.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/required_number_input.tsx new file mode 100644 index 0000000000000..7b62016c4e502 --- /dev/null +++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/required_number_input.tsx @@ -0,0 +1,87 @@ +/* + * 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, { ReactNode, useCallback, ChangeEvent } from 'react'; +import { EuiFormRow, EuiFieldNumber } from '@elastic/eui'; +import { useValidation } from './utils'; + +interface NumberInputOptionProps { + disabled?: boolean; + error?: ReactNode; + isInvalid?: boolean; + label?: React.ReactNode; + max?: number; + min?: number; + paramName: ParamName; + step?: number; + value: number | null; + 'data-test-subj'?: string; + setValue(paramName: ParamName, value: number | null): void; + setValidity(paramName: ParamName, isValid: boolean): void; +} + +/** + * Use only this component instead of NumberInputOption in 'number_input.tsx'. + * It is required for compatibility with TS 3.7.0 + * + * @param {number} props.value Should be numeric only + */ +function NumberInputOption({ + disabled, + error, + isInvalid, + label, + max, + min, + paramName, + step, + value, + setValue, + setValidity, + 'data-test-subj': dataTestSubj, +}: NumberInputOptionProps) { + const isValid = value !== null; + useValidation(setValidity, paramName, isValid); + + const onChange = useCallback( + (ev: ChangeEvent) => + setValue(paramName, isNaN(ev.target.valueAsNumber) ? null : ev.target.valueAsNumber), + [setValue, paramName] + ); + + return ( + + + + ); +} + +export { NumberInputOption }; diff --git a/packages/kbn-es-query/src/filters/lib/phrases_filter.ts b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/utils.ts similarity index 68% rename from packages/kbn-es-query/src/filters/lib/phrases_filter.ts rename to src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/utils.ts index 213afb409a0a6..d51631106dda7 100644 --- a/packages/kbn-es-query/src/filters/lib/phrases_filter.ts +++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/utils.ts @@ -17,16 +17,18 @@ * under the License. */ -import { Filter, FilterMeta } from './meta_filter'; +import { useEffect } from 'react'; -export type PhrasesFilterMeta = FilterMeta & { - params: string[]; // The unformatted values - field?: string; -}; +function useValidation( + setValidity: (paramName: ParamName, isValid: boolean) => void, + paramName: ParamName, + isValid: boolean +) { + useEffect(() => { + setValidity(paramName, isValid); -export type PhrasesFilter = Filter & { - meta: PhrasesFilterMeta; -}; + return () => setValidity(paramName, true); + }, [isValid, paramName, setValidity]); +} -export const isPhrasesFilter = (filter: any): filter is PhrasesFilter => - filter && filter.meta.type === 'phrases'; +export { useValidation }; diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/point_series.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/point_series.tsx index 8e3f66d12b9bd..ed3b52b83c234 100644 --- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/point_series.tsx +++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/point_series.tsx @@ -21,13 +21,12 @@ import { EuiPanel, EuiTitle, EuiSpacer } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; -import { VisOptionsProps } from 'ui/vis/editors/default'; -import { BasicOptions, SwitchOption } from '../../common'; +import { BasicOptions, SwitchOption, ValidationVisOptionsProps } from '../../common'; import { GridPanel } from './grid_panel'; import { ThresholdPanel } from './threshold_panel'; import { BasicVislibParams } from '../../../types'; -function PointSeriesOptions(props: VisOptionsProps) { +function PointSeriesOptions(props: ValidationVisOptionsProps) { const { stateParams, setValue, vis } = props; return ( diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/threshold_panel.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/threshold_panel.tsx index 49e56e377a8d5..591ad2eb3a001 100644 --- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/threshold_panel.tsx +++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/threshold_panel.tsx @@ -21,11 +21,16 @@ import { EuiPanel, EuiTitle, EuiColorPicker, EuiFormRow, EuiSpacer } from '@elas import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; -import { VisOptionsProps } from 'ui/vis/editors/default'; -import { NumberInputOption, SelectOption, SwitchOption } from '../../common'; +import { SelectOption, SwitchOption, ValidationVisOptionsProps } from '../../common'; +import { NumberInputOption } from '../../common/required_number_input'; import { BasicVislibParams } from '../../../types'; -function ThresholdPanel({ stateParams, setValue, vis }: VisOptionsProps) { +function ThresholdPanel({ + stateParams, + setValue, + setMultipleValidity, + vis, +}: ValidationVisOptionsProps) { const setThresholdLine = useCallback( ( paramName: T, @@ -39,6 +44,12 @@ function ThresholdPanel({ stateParams, setValue, vis }: VisOptionsProps + setMultipleValidity(`thresholdLine__${paramName}`, isValid), + [setMultipleValidity] + ); + return ( @@ -72,6 +83,7 @@ function ThresholdPanel({ stateParams, setValue, vis }: VisOptionsProps ) => ( + + ), }, ]; } diff --git a/src/legacy/core_plugins/kibana/migrations/migrations.js b/src/legacy/core_plugins/kibana/migrations/migrations.js index 9f3561f39101d..e024e98acb343 100644 --- a/src/legacy/core_plugins/kibana/migrations/migrations.js +++ b/src/legacy/core_plugins/kibana/migrations/migrations.js @@ -460,6 +460,31 @@ function migrateFiltersAggQueryStringQueries(doc) { } +function migrateSubTypeAndParentFieldProperties(doc) { + if (!doc.attributes.fields) return doc; + + const fieldsString = doc.attributes.fields; + const fields = JSON.parse(fieldsString); + const migratedFields = fields.map(field => { + if (field.subType === 'multi') { + return { + ...omit(field, 'parent'), + subType: { multi: { parent: field.parent } } + }; + } + + return field; + }); + + return { + ...doc, + attributes: { + ...doc.attributes, + fields: JSON.stringify(migratedFields), + } + }; +} + const executeMigrations720 = flow( migratePercentileRankAggregation, migrateDateHistogramAggregation @@ -490,6 +515,9 @@ export const migrations = { doc.attributes.typeMeta = doc.attributes.typeMeta || undefined; return doc; }, + '7.6.0': flow( + migrateSubTypeAndParentFieldProperties + ) }, visualization: { /** diff --git a/src/legacy/core_plugins/kibana/migrations/migrations.test.js b/src/legacy/core_plugins/kibana/migrations/migrations.test.js index 5368169d6dd6d..14f1e8c80e349 100644 --- a/src/legacy/core_plugins/kibana/migrations/migrations.test.js +++ b/src/legacy/core_plugins/kibana/migrations/migrations.test.js @@ -56,6 +56,29 @@ Object { `); }); }); + + describe('7.6.0', function () { + const migrate = doc => migrations['index-pattern']['7.6.0'](doc); + + it('should remove the parent property and update the subType prop on every field that has them', () => { + const input = { + attributes: { + title: 'test', + // eslint-disable-next-line max-len + fields: '[{"name":"customer_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":"multi","parent":"customer_name"}]', + }, + }; + const expected = { + attributes: { + title: 'test', + // eslint-disable-next-line max-len + fields: '[{"name":"customer_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"customer_name"}}}]', + }, + }; + + expect(migrate(input)).toEqual(expected); + }); + }); }); describe('visualization', () => { diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.tsx b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.tsx index 7a0398e86a60d..5fa3a938ed9df 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.tsx +++ b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.tsx @@ -35,7 +35,6 @@ import { } from 'ui/state_management/app_state'; import { KbnUrl } from 'ui/url/kbn_url'; -import { Filter } from '@kbn/es-query'; import { TimeRange } from 'src/plugins/data/public'; import { IndexPattern } from 'ui/index_patterns'; import { IPrivate } from 'ui/private'; @@ -46,6 +45,7 @@ import { Subscription } from 'rxjs'; import { ViewMode } from '../../../embeddable_api/public/np_ready/public'; import { SavedObjectDashboard } from './saved_dashboard/saved_dashboard'; import { DashboardAppState, SavedDashboardPanel, ConfirmModalFn } from './types'; +import { esFilters } from '../../../../../../src/plugins/data/public'; import { DashboardAppController } from './dashboard_app_controller'; @@ -55,7 +55,7 @@ export interface DashboardAppScope extends ng.IScope { screenTitle: string; model: { query: Query; - filters: Filter[]; + filters: esFilters.Filter[]; timeRestore: boolean; title: string; description: string; @@ -81,9 +81,9 @@ export interface DashboardAppScope extends ng.IScope { isPaused: boolean; refreshInterval: any; }) => void; - onFiltersUpdated: (filters: Filter[]) => void; + onFiltersUpdated: (filters: esFilters.Filter[]) => void; onCancelApplyFilters: () => void; - onApplyFilters: (filters: Filter[]) => void; + onApplyFilters: (filters: esFilters.Filter[]) => void; onQuerySaved: (savedQuery: SavedQuery) => void; onSavedQueryUpdated: (savedQuery: SavedQuery) => void; onClearSavedQuery: () => void; diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx index abf7b22a6e48c..64c7560947681 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx +++ b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx @@ -48,7 +48,6 @@ import { } from 'ui/state_management/app_state'; import { KbnUrl } from 'ui/url/kbn_url'; -import { Filter } from '@kbn/es-query'; import { IndexPattern } from 'ui/index_patterns'; import { IPrivate } from 'ui/private'; import { Query, SavedQuery } from 'src/legacy/core_plugins/data/public'; @@ -59,6 +58,7 @@ import { npStart } from 'ui/new_platform'; import { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder'; import { extractTimeFilter, changeTimeFilter } from '../../../data/public'; import { start as data } from '../../../data/public/legacy'; +import { esFilters } from '../../../../../plugins/data/public'; import { DashboardContainer, @@ -514,7 +514,7 @@ export class DashboardAppController { } ); - $scope.$watch('appState.$newFilters', (filters: Filter[] = []) => { + $scope.$watch('appState.$newFilters', (filters: esFilters.Filter[] = []) => { if (filters.length === 1) { $scope.onApplyFilters(filters); } diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.ts b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.ts index 7c1fc771de349..8ffabe5add1c3 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.ts +++ b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.ts @@ -20,7 +20,6 @@ import { i18n } from '@kbn/i18n'; import _ from 'lodash'; -import { Filter } from '@kbn/es-query'; import { stateMonitorFactory, StateMonitor } from 'ui/state_management/state_monitor_factory'; import { Timefilter } from 'ui/timefilter'; import { AppStateClass as TAppStateClass } from 'ui/state_management/app_state'; @@ -29,6 +28,7 @@ import { Moment } from 'moment'; import { DashboardContainer } from 'src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public'; import { ViewMode } from '../../../../../../src/plugins/embeddable/public'; +import { esFilters } from '../../../../../../src/plugins/data/public'; import { Query } from '../../../data/public'; import { getAppStateDefaults, migrateAppState } from './lib'; @@ -50,7 +50,7 @@ export class DashboardStateManager { public lastSavedDashboardFilters: { timeTo?: string | Moment; timeFrom?: string | Moment; - filterBars: Filter[]; + filterBars: esFilters.Filter[]; query: Query; }; private stateDefaults: DashboardAppStateDefaults; @@ -303,7 +303,7 @@ export class DashboardStateManager { return this.savedDashboard.timeRestore; } - public getLastSavedFilterBars(): Filter[] { + public getLastSavedFilterBars(): esFilters.Filter[] { return this.lastSavedDashboardFilters.filterBars; } @@ -461,7 +461,7 @@ export class DashboardStateManager { * Applies the current filter state to the dashboard. * @param filter An array of filter bar filters. */ - public applyFilters(query: Query, filters: Filter[]) { + public applyFilters(query: Query, filters: esFilters.Filter[]) { this.appState.query = query; this.savedDashboard.searchSource.setField('query', query); this.savedDashboard.searchSource.setField('filter', filters); diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/filter_utils.ts b/src/legacy/core_plugins/kibana/public/dashboard/lib/filter_utils.ts index 1fd50081c58bd..19a0c32210737 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/lib/filter_utils.ts +++ b/src/legacy/core_plugins/kibana/public/dashboard/lib/filter_utils.ts @@ -19,7 +19,7 @@ import _ from 'lodash'; import moment, { Moment } from 'moment'; -import { Filter } from '@kbn/es-query'; +import { esFilters } from '../../../../../../plugins/data/public'; /** * @typedef {Object} QueryFilter @@ -65,9 +65,9 @@ export class FilterUtils { * @param filters {Array.} * @returns {Array.} */ - public static cleanFiltersForComparison(filters: Filter[]) { + public static cleanFiltersForComparison(filters: esFilters.Filter[]) { return _.map(filters, filter => { - const f: Partial = _.omit(filter, ['$$hashKey', '$state']); + const f: Partial = _.omit(filter, ['$$hashKey', '$state']); if (f.meta) { // f.meta.value is the value displayed in the filter bar. // It may also be loaded differently and shouldn't be used in this comparison. diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.test.ts index 1f503ee675407..ae3edae3b85d6 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.test.ts +++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.test.ts @@ -18,12 +18,12 @@ */ import { moveFiltersToQuery, Pre600FilterQuery } from './move_filters_to_query'; -import { Filter, FilterStateStore } from '@kbn/es-query'; +import { esFilters } from '../../../../../../plugins/data/public'; -const filter: Filter = { +const filter: esFilters.Filter = { meta: { disabled: false, negate: false, alias: '' }, query: {}, - $state: { store: FilterStateStore.APP_STATE }, + $state: { store: esFilters.FilterStateStore.APP_STATE }, }; const queryFilter: Pre600FilterQuery = { @@ -38,7 +38,7 @@ test('Migrates an old filter query into the query field', () => { expect(newSearchSource).toEqual({ filter: [ { - $state: { store: FilterStateStore.APP_STATE }, + $state: { store: esFilters.FilterStateStore.APP_STATE }, meta: { alias: '', disabled: false, diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.ts index 153bdeba9d35f..8522495b9dedb 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.ts +++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.ts @@ -18,7 +18,7 @@ */ import { Query } from 'src/legacy/core_plugins/data/public'; -import { Filter } from '@kbn/es-query'; +import { esFilters } from '../../../../../../plugins/data/public'; export interface Pre600FilterQuery { // pre 6.0.0 global query:queryString:options were stored per dashboard and would @@ -30,18 +30,18 @@ export interface Pre600FilterQuery { export interface SearchSourcePre600 { // I encountered at least one export from 7.0.0-alpha that was missing the filter property in here. // The maps data in esarchives actually has it, but I don't know how/when they created it. - filter?: Array; + filter?: Array; } export interface SearchSource730 { - filter: Filter[]; + filter: esFilters.Filter[]; query: Query; highlightAll?: boolean; version?: boolean; } -function isQueryFilter(filter: Filter | { query: unknown }): filter is Pre600FilterQuery { - return filter.query && !(filter as Filter).meta; +function isQueryFilter(filter: esFilters.Filter | { query: unknown }): filter is Pre600FilterQuery { + return filter.query && !(filter as esFilters.Filter).meta; } export function moveFiltersToQuery( diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.d.ts b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.d.ts index 1231ca28ed014..5b860b0a2cc7c 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.d.ts +++ b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.d.ts @@ -19,10 +19,9 @@ import { SearchSource } from 'ui/courier'; import { SavedObject } from 'ui/saved_objects/saved_object'; -import moment from 'moment'; import { RefreshInterval } from 'src/plugins/data/public'; import { Query } from 'src/legacy/core_plugins/data/public'; -import { Filter } from '@kbn/es-query'; +import { esFilters } from '../../../../../../plugins/data/public'; export interface SavedObjectDashboard extends SavedObject { id?: string; @@ -41,5 +40,5 @@ export interface SavedObjectDashboard extends SavedObject { destroy: () => void; refreshInterval?: RefreshInterval; getQuery(): Query; - getFilters(): Filter[]; + getFilters(): esFilters.Filter[]; } diff --git a/src/legacy/core_plugins/kibana/public/dashboard/types.ts b/src/legacy/core_plugins/kibana/public/dashboard/types.ts index ccccc89004e36..5aaca7b62094f 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/types.ts +++ b/src/legacy/core_plugins/kibana/public/dashboard/types.ts @@ -18,7 +18,6 @@ */ import { AppState } from 'ui/state_management/app_state'; -import { Filter } from '@kbn/es-query'; import { Query } from 'src/legacy/core_plugins/data/public'; import { AppState as TAppState } from 'ui/state_management/app_state'; import { ViewMode } from 'src/plugins/embeddable/public'; @@ -30,6 +29,7 @@ import { RawSavedDashboardPanel640To720, RawSavedDashboardPanel730ToLatest, } from './migrations/types'; +import { esFilters } from '../../../../../plugins/data/public'; export type NavAction = (anchorElement?: any) => void; @@ -110,7 +110,7 @@ export interface DashboardAppStateParameters { useMargins: boolean; }; query: Query | string; - filters: Filter[]; + filters: esFilters.Filter[]; viewMode: ViewMode; savedQuery?: string; } diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/context.ts b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/context.ts index 268f176f2c61e..3314bbbf189c4 100644 --- a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/context.ts +++ b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/context.ts @@ -17,7 +17,6 @@ * under the License. */ -import { Filter } from '@kbn/es-query'; import { IndexPatterns, IndexPattern, getServices } from '../../../kibana_services'; import { reverseSortDir, SortDirection } from './utils/sorting'; import { extractNanos, convertIsoToMillis } from './utils/date_conversion'; @@ -25,6 +24,7 @@ import { fetchHitsInInterval } from './utils/fetch_hits_in_interval'; import { generateIntervals } from './utils/generate_intervals'; import { getEsQuerySearchAfter } from './utils/get_es_query_search_after'; import { getEsQuerySort } from './utils/get_es_query_sort'; +import { esFilters } from '../../../../../../../../plugins/data/public'; export type SurrDocType = 'successors' | 'predecessors'; export interface EsHitRecord { @@ -67,7 +67,7 @@ function fetchContextProvider(indexPatterns: IndexPatterns) { tieBreakerField: string, sortDir: SortDirection, size: number, - filters: Filter[] + filters: esFilters.Filter[] ) { if (typeof anchor !== 'object' || anchor === null) { return []; @@ -112,7 +112,7 @@ function fetchContextProvider(indexPatterns: IndexPatterns) { return documents; } - async function createSearchSource(indexPattern: IndexPattern, filters: Filter[]) { + async function createSearchSource(indexPattern: IndexPattern, filters: esFilters.Filter[]) { return new SearchSource() .setParent(false) .setField('index', indexPattern) diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_buttons.tsx b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_buttons.tsx index 6ce987028c197..3edcda8c3bea9 100644 --- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_buttons.tsx +++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_buttons.tsx @@ -34,7 +34,7 @@ export function ToolBarPagerButtons(props: Props) { disabled={!props.hasPreviousPage} data-test-subj="btnPrevPage" > - + ); diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row.js b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row.js index 355d9defbb63d..6f5a94442e977 100644 --- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row.js +++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row.js @@ -26,10 +26,10 @@ import { noWhiteSpace } from '../../../../../common/utils/no_white_space'; import openRowHtml from './table_row/open.html'; import detailsHtml from './table_row/details.html'; import { getServices } from '../../../kibana_services'; -import { disableFilter } from '@kbn/es-query'; import { dispatchRenderComplete } from '../../../../../../../../plugins/kibana_utils/public'; import cellTemplateHtml from '../components/table_row/cell.html'; import truncateByHeightTemplateHtml from '../components/table_row/truncate_by_height.html'; +import { esFilters } from '../../../../../../../../plugins/data/public'; const module = getServices().uiModules.get('app/discover'); @@ -117,7 +117,7 @@ module.directive('kbnTableRow', function ($compile, $httpParamSerializer, kbnUrl const hash = $httpParamSerializer({ _a: rison.encode({ columns: $scope.columns, - filters: ($scope.filters || []).map(disableFilter), + filters: ($scope.filters || []).map(esFilters.disableFilter), }), }); return `${path}?${hash}`; diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_field_chooser.scss b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_field_chooser.scss index 6960c7101fa10..fe13ac2fafa01 100644 --- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_field_chooser.scss +++ b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_field_chooser.scss @@ -27,3 +27,11 @@ padding-left: $euiSizeXS; margin-left: $euiSizeXS; } + +.dscFieldSearch__filterWrapper { + flex-grow: 0; +} + +.dscFieldSearch__formWrapper { + padding: $euiSizeM; +} diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.test.tsx b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.test.tsx index 2655d28af985b..c207585499483 100644 --- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.test.tsx +++ b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.test.tsx @@ -17,54 +17,123 @@ * under the License. */ import React from 'react'; +import { act } from 'react-dom/test-utils'; import { mountWithIntl } from 'test_utils/enzyme_helpers'; // @ts-ignore import { findTestSubject } from '@elastic/eui/lib/test'; -import { DiscoverFieldSearch } from './discover_field_search'; +import { DiscoverFieldSearch, Props } from './discover_field_search'; +import { EuiButtonGroupProps } from '@elastic/eui'; +import { ReactWrapper } from 'enzyme'; describe('DiscoverFieldSearch', () => { - function mountComponent() { - const props = { - onChange: jest.fn(), - onShowFilter: jest.fn(), - showFilter: false, - filtersActive: 0, - value: 'test', - }; - const comp = mountWithIntl(); - const input = findTestSubject(comp, 'fieldFilterSearchInput'); - const btn = findTestSubject(comp, 'toggleFieldFilterButton'); - return { comp, input, btn, props }; + const defaultProps = { + onChange: jest.fn(), + value: 'test', + types: ['any', 'string', '_source'], + }; + + function mountComponent(props?: Props) { + const compProps = props || defaultProps; + const comp = mountWithIntl(); + return comp; + } + + function findButtonGroup(component: ReactWrapper, id: string) { + return component.find(`[data-test-subj="${id}ButtonGroup"]`).first(); } test('enter value', () => { - const { input, props } = mountComponent(); + const component = mountComponent(); + const input = findTestSubject(component, 'fieldFilterSearchInput'); input.simulate('change', { target: { value: 'new filter' } }); - expect(props.onChange).toBeCalledTimes(1); + expect(defaultProps.onChange).toBeCalledTimes(1); }); - // this should work, but doesn't, have to do some research - test('click toggle filter button', () => { - const { btn, props } = mountComponent(); + test('change in active filters should change facet selection and call onChange', () => { + const onChange = jest.fn(); + const component = mountComponent({ ...defaultProps, ...{ onChange } }); + let btn = findTestSubject(component, 'toggleFieldFilterButton'); + expect(btn.hasClass('euiFacetButton--isSelected')).toBeFalsy(); btn.simulate('click'); - expect(props.onShowFilter).toBeCalledTimes(1); + const aggregatableButtonGroup = findButtonGroup(component, 'aggregatable'); + act(() => { + // @ts-ignore + (aggregatableButtonGroup.props() as EuiButtonGroupProps).onChange('aggregatable-true', null); + }); + component.update(); + btn = findTestSubject(component, 'toggleFieldFilterButton'); + expect(btn.hasClass('euiFacetButton--isSelected')).toBe(true); + expect(onChange).toBeCalledWith('aggregatable', true); }); - test('change showFilter value should change aria label', () => { - const { comp } = mountComponent(); - let btn = findTestSubject(comp, 'toggleFieldFilterButton'); - expect(btn.prop('aria-label')).toEqual('Show field filter settings'); - comp.setProps({ showFilter: true }); - btn = findTestSubject(comp, 'toggleFieldFilterButton'); - expect(btn.prop('aria-label')).toEqual('Hide field filter settings'); + test('change in active filters should change filters count', () => { + const component = mountComponent(); + let btn = findTestSubject(component, 'toggleFieldFilterButton'); + btn.simulate('click'); + btn = findTestSubject(component, 'toggleFieldFilterButton'); + const badge = btn.find('.euiNotificationBadge'); + // no active filters + expect(badge.text()).toEqual('0'); + // change value of aggregatable select + const aggregatableButtonGroup = findButtonGroup(component, 'aggregatable'); + act(() => { + // @ts-ignore + (aggregatableButtonGroup.props() as EuiButtonGroupProps).onChange('aggregatable-true', null); + }); + component.update(); + expect(badge.text()).toEqual('1'); + // change value of searchable select + const searchableButtonGroup = findButtonGroup(component, 'searchable'); + act(() => { + // @ts-ignore + (searchableButtonGroup.props() as EuiButtonGroupProps).onChange('searchable-true', null); + }); + component.update(); + expect(badge.text()).toEqual('2'); + // change value of searchable select + act(() => { + // @ts-ignore + (searchableButtonGroup.props() as EuiButtonGroupProps).onChange('searchable-any', null); + }); + component.update(); + expect(badge.text()).toEqual('1'); }); - test('change filtersActive should change facet selection', () => { - const { comp } = mountComponent(); - let btn = findTestSubject(comp, 'toggleFieldFilterButton'); - expect(btn.hasClass('euiFacetButton--isSelected')).toBeFalsy(); - comp.setProps({ filtersActive: 3 }); - btn = findTestSubject(comp, 'toggleFieldFilterButton'); - expect(btn.hasClass('euiFacetButton--isSelected')).toBe(true); + test('change in missing fields switch should not change filter count', () => { + const component = mountComponent(); + const btn = findTestSubject(component, 'toggleFieldFilterButton'); + btn.simulate('click'); + const badge = btn.find('.euiNotificationBadge'); + expect(badge.text()).toEqual('0'); + const missingSwitch = findTestSubject(component, 'missingSwitch'); + missingSwitch.simulate('change', { target: { value: false } }); + expect(badge.text()).toEqual('0'); + }); + + test('change in filters triggers onChange', () => { + const onChange = jest.fn(); + const component = mountComponent({ ...defaultProps, ...{ onChange } }); + const btn = findTestSubject(component, 'toggleFieldFilterButton'); + btn.simulate('click'); + const aggregtableButtonGroup = findButtonGroup(component, 'aggregatable'); + const missingSwitch = findTestSubject(component, 'missingSwitch'); + act(() => { + // @ts-ignore + (aggregtableButtonGroup.props() as EuiButtonGroupProps).onChange('aggregatable-true', null); + }); + missingSwitch.simulate('change', { target: { value: false } }); + expect(onChange).toBeCalledTimes(2); + }); + + test('change in type filters triggers onChange with appropriate value', () => { + const onChange = jest.fn(); + const component = mountComponent({ ...defaultProps, ...{ onChange } }); + const btn = findTestSubject(component, 'toggleFieldFilterButton'); + btn.simulate('click'); + const typeSelector = findTestSubject(component, 'typeSelect'); + typeSelector.simulate('change', { target: { value: 'string' } }); + expect(onChange).toBeCalledWith('type', 'string'); + typeSelector.simulate('change', { target: { value: 'any' } }); + expect(onChange).toBeCalledWith('type', 'any'); }); }); diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.tsx b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.tsx index f748cdae1b4fc..f0685c4357c5a 100644 --- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.tsx +++ b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.tsx @@ -16,61 +16,234 @@ * specific language governing permissions and limitations * under the License. */ -import React from 'react'; +import React, { OptionHTMLAttributes, ReactNode, useState } from 'react'; import { i18n } from '@kbn/i18n'; -import { EuiFacetButton, EuiFieldSearch, EuiFlexGroup, EuiFlexItem, EuiIcon } from '@elastic/eui'; +import { + EuiFacetButton, + EuiFieldSearch, + EuiFlexGroup, + EuiFlexItem, + EuiIcon, + EuiPopover, + EuiPopoverFooter, + EuiPopoverTitle, + EuiSelect, + EuiSwitch, + EuiForm, + EuiFormRow, + EuiButtonGroup, +} from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; +export interface State { + searchable: string; + aggregatable: string; + type: string; + missing: boolean; + [index: string]: string | boolean; +} + export interface Props { /** * triggered on input of user into search field */ - onChange: (field: string, value: string) => void; - /** - * triggered when the "additional filter btn" is clicked - */ - onShowFilter: () => void; - /** - * determines whether additional filter fields are displayed - */ - showFilter: boolean; + onChange: (field: string, value: string | boolean | undefined) => void; + /** * the input value of the user */ value?: string; + /** - * the number of selected filters + * types for the type filter */ - filtersActive: number; + types: string[]; } /** * Component is Discover's side bar to search of available fields * Additionally there's a button displayed that allows the user to show/hide more filter fields */ -export function DiscoverFieldSearch({ - showFilter, - onChange, - onShowFilter, - value, - filtersActive, -}: Props) { +export function DiscoverFieldSearch({ onChange, value, types }: Props) { if (typeof value !== 'string') { // at initial rendering value is undefined (angular related), this catches the warning // should be removed once all is react return null; } - const filterBtnAriaLabel = showFilter + const searchPlaceholder = i18n.translate('kbn.discover.fieldChooser.searchPlaceHolder', { + defaultMessage: 'Search field names', + }); + const aggregatableLabel = i18n.translate('kbn.discover.fieldChooser.filter.aggregatableLabel', { + defaultMessage: 'Aggregatable', + }); + const searchableLabel = i18n.translate('kbn.discover.fieldChooser.filter.searchableLabel', { + defaultMessage: 'Searchable', + }); + const typeLabel = i18n.translate('kbn.discover.fieldChooser.filter.typeLabel', { + defaultMessage: 'Type', + }); + const typeOptions = types + ? types.map(type => { + return { value: type, text: type }; + }) + : [{ value: 'any', text: 'any' }]; + + const [activeFiltersCount, setActiveFiltersCount] = useState(0); + const [isPopoverOpen, setPopoverOpen] = useState(false); + const [values, setValues] = useState({ + searchable: 'any', + aggregatable: 'any', + type: 'any', + missing: true, + }); + + const filterBtnAriaLabel = isPopoverOpen ? i18n.translate('kbn.discover.fieldChooser.toggleFieldFilterButtonHideAriaLabel', { defaultMessage: 'Hide field filter settings', }) : i18n.translate('kbn.discover.fieldChooser.toggleFieldFilterButtonShowAriaLabel', { defaultMessage: 'Show field filter settings', }); - const searchPlaceholder = i18n.translate('kbn.discover.fieldChooser.searchPlaceHolder', { - defaultMessage: 'Search fields', - }); + const handleFacetButtonClicked = () => { + setPopoverOpen(!isPopoverOpen); + }; + + const applyFilterValue = (id: string, filterValue: string | boolean) => { + switch (filterValue) { + case 'any': + if (id !== 'type') { + onChange(id, undefined); + } else { + onChange(id, filterValue); + } + break; + case 'true': + onChange(id, true); + break; + case 'false': + onChange(id, false); + break; + default: + onChange(id, filterValue); + } + }; + + const isFilterActive = (name: string, filterValue: string | boolean) => { + return name !== 'missing' && filterValue !== 'any'; + }; + + const handleValueChange = (name: string, filterValue: string | boolean) => { + const previousValue = values[name]; + updateFilterCount(name, previousValue, filterValue); + const updatedValues = { ...values }; + updatedValues[name] = filterValue; + setValues(updatedValues); + applyFilterValue(name, filterValue); + }; + + const updateFilterCount = ( + name: string, + previousValue: string | boolean, + currentValue: string | boolean + ) => { + const previouslyFilterActive = isFilterActive(name, previousValue); + const filterActive = isFilterActive(name, currentValue); + const diff = Number(filterActive) - Number(previouslyFilterActive); + setActiveFiltersCount(activeFiltersCount + diff); + }; + + const handleMissingChange = (e: React.ChangeEvent) => { + const missingValue = e.target.checked; + handleValueChange('missing', missingValue); + }; + + const buttonContent = ( + } + isSelected={activeFiltersCount > 0} + quantity={activeFiltersCount} + onClick={handleFacetButtonClicked} + > + + + ); + + const select = ( + id: string, + selectOptions: Array<{ text: ReactNode } & OptionHTMLAttributes>, + selectValue: string + ) => { + return ( + ) => + handleValueChange(id, e.target.value) + } + aria-label={i18n.translate('kbn.discover.fieldChooser.filter.fieldSelectorLabel', { + defaultMessage: 'Selection of {id} filter options', + values: { id }, + })} + data-test-subj={`${id}Select`} + compressed + /> + ); + }; + + const toggleButtons = (id: string) => { + return [ + { + id: `${id}-any`, + label: 'any', + }, + { + id: `${id}-true`, + label: 'yes', + }, + { + id: `${id}-false`, + label: 'no', + }, + ]; + }; + + const buttonGroup = (id: string, legend: string) => { + return ( + handleValueChange(id, optionId.replace(`${id}-`, ''))} + buttonSize="compressed" + isFullWidth + data-test-subj={`${id}ButtonGroup`} + /> + ); + }; + + const selectionPanel = ( +
+ + + {buttonGroup('aggregatable', aggregatableLabel)} + + + {buttonGroup('searchable', searchableLabel)} + + + {select('type', typeOptions, values.type)} + + +
+ ); return ( @@ -86,20 +259,35 @@ export function DiscoverFieldSearch({ /> - } - isSelected={filtersActive > 0} - quantity={filtersActive} - onClick={() => onShowFilter()} - > - - +
+ {}} + button={buttonContent} + > + + {i18n.translate('kbn.discover.fieldChooser.filter.filterByTypeLabel', { + defaultMessage: 'Filter by type', + })} + + {selectionPanel} + + + + +
); } diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search_directive.ts b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search_directive.ts index 2e7dd3e210ef8..b78f993e18772 100644 --- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search_directive.ts +++ b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search_directive.ts @@ -27,9 +27,7 @@ const app = uiModules.get('apps/discover'); app.directive('discoverFieldSearch', function(reactDirective: any) { return reactDirective(wrapInI18nContext(DiscoverFieldSearch), [ ['onChange', { watchDepth: 'reference' }], - ['onShowFilter', { watchDepth: 'reference' }], - ['showFilter', { watchDepth: 'value' }], ['value', { watchDepth: 'value' }], - ['filtersActive', { watchDepth: 'value' }], + ['types', { watchDepth: 'value' }], ]); }); diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html index 3d8b38c278f31..adf4b1b4326e8 100644 --- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html +++ b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html @@ -9,10 +9,8 @@
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts b/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts index 5f3ebd6d22e24..31b28d21fe8d8 100644 --- a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts +++ b/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts @@ -19,11 +19,12 @@ import _ from 'lodash'; import * as Rx from 'rxjs'; import { Subscription } from 'rxjs'; -import { Filter, FilterStateStore } from '@kbn/es-query'; import { i18n } from '@kbn/i18n'; import { TExecuteTriggerActions } from 'src/plugins/ui_actions/public'; +import { TimeRange, onlyDisabledFiltersChanged } from '../../../../../../plugins/data/public'; import { setup as data } from '../../../../data/public/legacy'; -import { getTime, onlyDisabledFiltersChanged, Query } from '../../../../data/public'; +import { Query, getTime } from '../../../../data/public'; +import { esFilters } from '../../../../../../plugins/data/public'; import { APPLY_FILTER_TRIGGER, Container, @@ -46,7 +47,6 @@ import { RequestAdapter, SearchSource, } from '../kibana_services'; -import { TimeRange } from '../../../../../../plugins/data/public'; import { SEARCH_EMBEDDABLE_TYPE } from './constants'; interface SearchScope extends ng.IScope { @@ -75,7 +75,7 @@ export interface FilterManager { values: string | string[], operation: string, index: number - ) => Filter[]; + ) => esFilters.Filter[]; } interface SearchEmbeddableConfig { @@ -105,7 +105,7 @@ export class SearchEmbeddable extends Embeddable private abortController?: AbortController; private prevTimeRange?: TimeRange; - private prevFilters?: Filter[]; + private prevFilters?: esFilters.Filter[]; private prevQuery?: Query; constructor( @@ -248,7 +248,7 @@ export class SearchEmbeddable extends Embeddable let filters = this.filterGen.generate(field, value, operator, indexPattern.id); filters = filters.map(filter => ({ ...filter, - $state: { store: FilterStateStore.APP_STATE }, + $state: { store: esFilters.FilterStateStore.APP_STATE }, })); await this.executeTriggerActions(APPLY_FILTER_TRIGGER, { diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/types.ts b/src/legacy/core_plugins/kibana/public/discover/embeddable/types.ts index db8d2afc7aff3..5473ec0e7b8b4 100644 --- a/src/legacy/core_plugins/kibana/public/discover/embeddable/types.ts +++ b/src/legacy/core_plugins/kibana/public/discover/embeddable/types.ts @@ -19,16 +19,16 @@ import { TimeRange } from 'src/plugins/data/public'; import { Query } from 'src/legacy/core_plugins/data/public'; -import { Filter } from '@kbn/es-query'; import { EmbeddableInput, EmbeddableOutput, IEmbeddable } from 'src/plugins/embeddable/public'; import { StaticIndexPattern } from '../kibana_services'; import { SavedSearch } from '../types'; import { SortOrder } from '../angular/doc_table/components/table_header/helpers'; +import { esFilters } from '../../../../../../plugins/data/public'; export interface SearchInput extends EmbeddableInput { timeRange: TimeRange; query?: Query; - filters?: Filter[]; + filters?: esFilters.Filter[]; hidePanelTitles?: boolean; columns?: string[]; sort?: SortOrder[]; diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts index dd0674073f442..b78d05e68acad 100644 --- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts +++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts @@ -18,6 +18,7 @@ */ import 'ui/collapsible_sidebar'; import 'ui/directives/listen'; +import 'ui/directives/storage'; import 'ui/fixed_scroll'; import 'ui/directives/css_truncate'; diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap b/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap index fcf60a6009b29..71c336b1d48d2 100644 --- a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap +++ b/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap @@ -2,6 +2,7 @@ exports[`home directories should not render directory entry when showOnHomePage is false 1`] = ` + diff --git a/src/legacy/core_plugins/kibana/public/home/components/home_app.js b/src/legacy/core_plugins/kibana/public/home/components/home_app.js index 005d4bdb0a99e..e4a6753e0771a 100644 --- a/src/legacy/core_plugins/kibana/public/home/components/home_app.js +++ b/src/legacy/core_plugins/kibana/public/home/components/home_app.js @@ -18,21 +18,16 @@ */ import React from 'react'; +import { I18nProvider } from '@kbn/i18n/react'; import PropTypes from 'prop-types'; import { Home } from './home'; import { FeatureDirectory } from './feature_directory'; import { TutorialDirectory } from './tutorial_directory'; import { Tutorial } from './tutorial/tutorial'; -import { - HashRouter as Router, - Switch, - Route, -} from 'react-router-dom'; +import { HashRouter as Router, Switch, Route, Redirect } from 'react-router-dom'; import { getTutorial } from '../load_tutorials'; import { replaceTemplateStrings } from './tutorial/replace_template_strings'; -import { - getServices -} from '../kibana_services'; +import { getServices } from '../kibana_services'; export function HomeApp({ directories }) { const { @@ -47,8 +42,9 @@ export function HomeApp({ directories }) { const isCloudEnabled = getInjected('isCloudEnabled', false); const apmUiEnabled = getInjected('apmUiEnabled', true); const mlEnabled = getInjected('mlEnabled', false); + const defaultAppId = getInjected('kbnDefaultAppId', 'discover'); - const renderTutorialDirectory = (props) => { + const renderTutorialDirectory = props => { return ( { + const renderTutorial = props => { return ( - - - - - - - - - - - + + + + + + + + + + + + + + + + + ); } HomeApp.propTypes = { - directories: PropTypes.arrayOf(PropTypes.shape({ - id: PropTypes.string.isRequired, - title: PropTypes.string.isRequired, - description: PropTypes.string.isRequired, - icon: PropTypes.string.isRequired, - path: PropTypes.string.isRequired, - showOnHomePage: PropTypes.bool.isRequired, - category: PropTypes.string.isRequired, - })), + directories: PropTypes.arrayOf( + PropTypes.shape({ + id: PropTypes.string.isRequired, + title: PropTypes.string.isRequired, + description: PropTypes.string.isRequired, + icon: PropTypes.string.isRequired, + path: PropTypes.string.isRequired, + showOnHomePage: PropTypes.bool.isRequired, + category: PropTypes.string.isRequired, + }) + ), }; diff --git a/src/legacy/core_plugins/kibana/public/home/home_ng_wrapper.html b/src/legacy/core_plugins/kibana/public/home/home_ng_wrapper.html deleted file mode 100644 index 645855766fab8..0000000000000 --- a/src/legacy/core_plugins/kibana/public/home/home_ng_wrapper.html +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/legacy/core_plugins/kibana/public/home/index.js b/src/legacy/core_plugins/kibana/public/home/index.js deleted file mode 100644 index 01f94b8ee4368..0000000000000 --- a/src/legacy/core_plugins/kibana/public/home/index.js +++ /dev/null @@ -1,61 +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 { getServices } from './kibana_services'; -import template from './home_ng_wrapper.html'; -import { - HomeApp -} from './components/home_app'; -import { i18n } from '@kbn/i18n'; - -const { wrapInI18nContext, uiRoutes, uiModules } = getServices(); - -const app = uiModules.get('apps/home', []); -app.directive('homeApp', function (reactDirective) { - return reactDirective(wrapInI18nContext(HomeApp)); -}); - -const homeTitle = i18n.translate('kbn.home.breadcrumbs.homeTitle', { defaultMessage: 'Home' }); - -function getRoute() { - return { - template, - resolve: { - directories: () => getServices().getFeatureCatalogueEntries() - }, - controller($scope, $route) { - const { chrome, addBasePath } = getServices(); - $scope.directories = $route.current.locals.directories; - $scope.recentlyAccessed = chrome.recentlyAccessed.get().map(item => { - item.link = addBasePath(item.link); - return item; - }); - }, - k7Breadcrumbs: () => [ - { text: homeTitle }, - ] - }; -} - -// All routing will be handled inside HomeApp via react, we just need to make sure angular doesn't -// redirect us to the default page by encountering a url it isn't marked as being able to handle. -uiRoutes.when('/home', getRoute()); -uiRoutes.when('/home/feature_directory', getRoute()); -uiRoutes.when('/home/tutorial_directory/:tab?', getRoute()); -uiRoutes.when('/home/tutorial/:id', getRoute()); diff --git a/src/legacy/core_plugins/kibana/public/home/index.ts b/src/legacy/core_plugins/kibana/public/home/index.ts new file mode 100644 index 0000000000000..4ebf719b86233 --- /dev/null +++ b/src/legacy/core_plugins/kibana/public/home/index.ts @@ -0,0 +1,80 @@ +/* + * 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 } from 'ui/registry/feature_catalogue'; +import { npSetup, npStart } from 'ui/new_platform'; +import chrome from 'ui/chrome'; +import { IPrivate } from 'ui/private'; +import { HomePlugin, LegacyAngularInjectedDependencies } from './plugin'; +import { createUiStatsReporter, METRIC_TYPE } from '../../../ui_metric/public'; +import { start as data } from '../../../data/public/legacy'; +import { TelemetryOptInProvider } from '../../../telemetry/public/services'; +import { localApplicationService } from '../local_application_service'; + +export const trackUiMetric = createUiStatsReporter('Kibana_home'); + +/** + * Get dependencies relying on the global angular context. + * They also have to get resolved together with the legacy imports above + */ +async function getAngularDependencies(): Promise { + const injector = await chrome.dangerouslyGetActiveInjector(); + + const Private = injector.get('Private'); + + const telemetryEnabled = npStart.core.injectedMetadata.getInjectedVar('telemetryEnabled'); + const telemetryBanner = npStart.core.injectedMetadata.getInjectedVar('telemetryBanner'); + const telemetryOptInProvider = Private(TelemetryOptInProvider); + + return { + telemetryOptInProvider, + shouldShowTelemetryOptIn: + telemetryEnabled && telemetryBanner && !telemetryOptInProvider.getOptIn(), + }; +} + +let copiedLegacyCatalogue = false; + +(async () => { + const instance = new HomePlugin(); + instance.setup(npSetup.core, { + __LEGACY: { + trackUiMetric, + metadata: npStart.core.injectedMetadata.getLegacyMetadata(), + METRIC_TYPE, + getFeatureCatalogueEntries: async () => { + if (!copiedLegacyCatalogue) { + const injector = await chrome.dangerouslyGetActiveInjector(); + const Private = injector.get('Private'); + // Merge legacy registry with new registry + (Private(FeatureCatalogueRegistryProvider as any) as any).inTitleOrder.map( + npSetup.plugins.feature_catalogue.register + ); + copiedLegacyCatalogue = true; + } + return npStart.plugins.feature_catalogue.get(); + }, + getAngularDependencies, + localApplicationService, + }, + }); + instance.start(npStart.core, { + data, + }); +})(); diff --git a/src/legacy/core_plugins/kibana/public/home/kibana_services.ts b/src/legacy/core_plugins/kibana/public/home/kibana_services.ts index b9f2ae1cfa7e8..6189204ee4cfc 100644 --- a/src/legacy/core_plugins/kibana/public/home/kibana_services.ts +++ b/src/legacy/core_plugins/kibana/public/home/kibana_services.ts @@ -17,69 +17,63 @@ * under the License. */ -// @ts-ignore -import { toastNotifications, banners } from 'ui/notify'; -import { kfetch } from 'ui/kfetch'; -import chrome from 'ui/chrome'; +import { + ChromeStart, + DocLinksStart, + HttpStart, + LegacyNavLink, + NotificationsSetup, + OverlayStart, + SavedObjectsClientContract, + UiSettingsClientContract, + UiSettingsState, +} from 'kibana/public'; +import { UiStatsMetricType } from '@kbn/analytics'; +import { FeatureCatalogueEntry } from '../../../../../plugins/feature_catalogue/public'; -import { wrapInI18nContext } from 'ui/i18n'; +export interface HomeKibanaServices { + indexPatternService: any; + getFeatureCatalogueEntries: () => Promise; + metadata: { + app: unknown; + bundleId: string; + nav: LegacyNavLink[]; + version: string; + branch: string; + buildNum: number; + buildSha: string; + basePath: string; + serverName: string; + devMode: boolean; + uiSettings: { defaults: UiSettingsState; user?: UiSettingsState | undefined }; + }; + getInjected: (name: string, defaultValue?: any) => unknown; + chrome: ChromeStart; + telemetryOptInProvider: any; + uiSettings: UiSettingsClientContract; + http: HttpStart; + savedObjectsClient: SavedObjectsClientContract; + toastNotifications: NotificationsSetup['toasts']; + banners: OverlayStart['banners']; + METRIC_TYPE: any; + trackUiMetric: (type: UiStatsMetricType, eventNames: string | string[], count?: number) => void; + getBasePath: () => string; + shouldShowTelemetryOptIn: boolean; + docLinks: DocLinksStart; + addBasePath: (url: string) => string; +} -// @ts-ignore -import { uiModules as modules } from 'ui/modules'; -import routes from 'ui/routes'; -import { npSetup, npStart } from 'ui/new_platform'; -import { IPrivate } from 'ui/private'; -import { FeatureCatalogueRegistryProvider } from 'ui/registry/feature_catalogue'; -import { createUiStatsReporter, METRIC_TYPE } from '../../../ui_metric/public'; -import { TelemetryOptInProvider } from '../../../telemetry/public/services'; -import { start as data } from '../../../data/public/legacy'; +let services: HomeKibanaServices | null = null; -let shouldShowTelemetryOptIn: boolean; -let telemetryOptInProvider: any; +export function setServices(newServices: HomeKibanaServices) { + services = newServices; +} export function getServices() { - return { - getInjected: npStart.core.injectedMetadata.getInjectedVar, - metadata: npStart.core.injectedMetadata.getLegacyMetadata(), - docLinks: npStart.core.docLinks, - - uiRoutes: routes, - uiModules: modules, - - savedObjectsClient: npStart.core.savedObjects.client, - chrome: npStart.core.chrome, - uiSettings: npStart.core.uiSettings, - addBasePath: npStart.core.http.basePath.prepend, - getBasePath: npStart.core.http.basePath.get, - - indexPatternService: data.indexPatterns.indexPatterns, - shouldShowTelemetryOptIn, - telemetryOptInProvider, - getFeatureCatalogueEntries: async () => { - const injector = await chrome.dangerouslyGetActiveInjector(); - const Private = injector.get('Private'); - // Merge legacy registry with new registry - (Private(FeatureCatalogueRegistryProvider as any) as any).inTitleOrder.map( - npSetup.plugins.feature_catalogue.register - ); - return npStart.plugins.feature_catalogue.get(); - }, - - trackUiMetric: createUiStatsReporter('Kibana_home'), - METRIC_TYPE, - - toastNotifications, - banners, - kfetch, - wrapInI18nContext, - }; + if (!services) { + throw new Error( + 'Kibana services not set - are you trying to import this module from outside of the home app?' + ); + } + return services; } - -modules.get('kibana').run((Private: IPrivate) => { - const telemetryEnabled = npStart.core.injectedMetadata.getInjectedVar('telemetryEnabled'); - const telemetryBanner = npStart.core.injectedMetadata.getInjectedVar('telemetryBanner'); - - telemetryOptInProvider = Private(TelemetryOptInProvider); - shouldShowTelemetryOptIn = - telemetryEnabled && telemetryBanner && !telemetryOptInProvider.getOptIn(); -}); diff --git a/src/legacy/core_plugins/kibana/public/home/plugin.ts b/src/legacy/core_plugins/kibana/public/home/plugin.ts new file mode 100644 index 0000000000000..2a2ea371d7f3b --- /dev/null +++ b/src/legacy/core_plugins/kibana/public/home/plugin.ts @@ -0,0 +1,103 @@ +/* + * 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 { CoreSetup, CoreStart, LegacyNavLink, Plugin, UiSettingsState } from 'kibana/public'; +import { UiStatsMetricType } from '@kbn/analytics'; + +import { DataStart } from '../../../data/public'; +import { LocalApplicationService } from '../local_application_service'; +import { setServices } from './kibana_services'; +import { FeatureCatalogueEntry } from '../../../../../plugins/feature_catalogue/public'; + +export interface LegacyAngularInjectedDependencies { + telemetryOptInProvider: any; + shouldShowTelemetryOptIn: boolean; +} + +export interface HomePluginStartDependencies { + data: DataStart; +} + +export interface HomePluginSetupDependencies { + __LEGACY: { + trackUiMetric: (type: UiStatsMetricType, eventNames: string | string[], count?: number) => void; + METRIC_TYPE: any; + metadata: { + app: unknown; + bundleId: string; + nav: LegacyNavLink[]; + version: string; + branch: string; + buildNum: number; + buildSha: string; + basePath: string; + serverName: string; + devMode: boolean; + uiSettings: { defaults: UiSettingsState; user?: UiSettingsState | undefined }; + }; + getFeatureCatalogueEntries: () => Promise; + getAngularDependencies: () => Promise; + localApplicationService: LocalApplicationService; + }; +} + +export class HomePlugin implements Plugin { + private dataStart: DataStart | null = null; + private savedObjectsClient: any = null; + + setup( + core: CoreSetup, + { + __LEGACY: { localApplicationService, getAngularDependencies, ...legacyServices }, + }: HomePluginSetupDependencies + ) { + localApplicationService.register({ + id: 'home', + title: 'Home', + mount: async ({ core: contextCore }, params) => { + const angularDependencies = await getAngularDependencies(); + setServices({ + ...legacyServices, + http: contextCore.http, + toastNotifications: core.notifications.toasts, + banners: contextCore.overlays.banners, + getInjected: core.injectedMetadata.getInjectedVar, + docLinks: contextCore.docLinks, + savedObjectsClient: this.savedObjectsClient!, + chrome: contextCore.chrome, + uiSettings: core.uiSettings, + addBasePath: core.http.basePath.prepend, + getBasePath: core.http.basePath.get, + indexPatternService: this.dataStart!.indexPatterns.indexPatterns, + ...angularDependencies, + }); + const { renderApp } = await import('./render_app'); + return await renderApp(params.element); + }, + }); + } + + start(core: CoreStart, { data }: HomePluginStartDependencies) { + // TODO is this really the right way? I though the app context would give us those + this.dataStart = data; + this.savedObjectsClient = core.savedObjects.client; + } + + stop() {} +} diff --git a/src/plugins/expressions/common/expressions/types/index.ts b/src/legacy/core_plugins/kibana/public/home/render_app.tsx similarity index 54% rename from src/plugins/expressions/common/expressions/types/index.ts rename to src/legacy/core_plugins/kibana/public/home/render_app.tsx index baa0850cfd76c..a8c35144a45b0 100644 --- a/src/plugins/expressions/common/expressions/types/index.ts +++ b/src/legacy/core_plugins/kibana/public/home/render_app.tsx @@ -17,29 +17,22 @@ * under the License. */ -export { ArgumentType } from './arguments'; -export { - TypeToString, - KnownTypeToString, - TypeString, - UnmappedTypeStrings, - UnwrapPromise, -} from './common'; -export { ExpressionFunction, AnyExpressionFunction, FunctionHandlers } from './functions'; -export { ExpressionType, AnyExpressionType } from './types'; -export * from '../expression_types'; +import React from 'react'; +import { render, unmountComponentAtNode } from 'react-dom'; +import { i18n } from '@kbn/i18n'; +// @ts-ignore +import { HomeApp } from './components/home_app'; +import { getServices } from './kibana_services'; -export type ExpressionArgAST = string | boolean | number | ExpressionAST; +export const renderApp = async (element: HTMLElement) => { + const homeTitle = i18n.translate('kbn.home.breadcrumbs.homeTitle', { defaultMessage: 'Home' }); + const { getFeatureCatalogueEntries, chrome } = getServices(); + const directories = await getFeatureCatalogueEntries(); + chrome.setBreadcrumbs([{ text: homeTitle }]); -export interface ExpressionFunctionAST { - type: 'function'; - function: string; - arguments: { - [key: string]: ExpressionArgAST[]; - }; -} + render(, element); -export interface ExpressionAST { - type: 'expression'; - chain: ExpressionFunctionAST[]; -} + return () => { + unmountComponentAtNode(element); + }; +}; diff --git a/src/legacy/core_plugins/kibana/public/home/sample_data_client.js b/src/legacy/core_plugins/kibana/public/home/sample_data_client.js index 9411373004c25..eca88604a559d 100644 --- a/src/legacy/core_plugins/kibana/public/home/sample_data_client.js +++ b/src/legacy/core_plugins/kibana/public/home/sample_data_client.js @@ -26,11 +26,11 @@ function clearIndexPatternsCache() { } export async function listSampleDataSets() { - return await getServices().kfetch({ method: 'GET', pathname: sampleDataUrl }); + return await getServices().http.get(sampleDataUrl); } export async function installSampleDataSet(id, sampleDataDefaultIndex) { - await getServices().kfetch({ method: 'POST', pathname: `${sampleDataUrl}/${id}` }); + await getServices().http.post(`${sampleDataUrl}/${id}`); if (getServices().uiSettings.isDefault('defaultIndex')) { getServices().uiSettings.set('defaultIndex', sampleDataDefaultIndex); @@ -40,7 +40,7 @@ export async function installSampleDataSet(id, sampleDataDefaultIndex) { } export async function uninstallSampleDataSet(id, sampleDataDefaultIndex) { - await getServices().kfetch({ method: 'DELETE', pathname: `${sampleDataUrl}/${id}` }); + await getServices().http.delete(`${sampleDataUrl}/${id}`); const uiSettings = getServices().uiSettings; diff --git a/src/legacy/core_plugins/kibana/public/home/tutorial_resources/cockroachdb_metrics/screenshot.png b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/cockroachdb_metrics/screenshot.png new file mode 100644 index 0000000000000..4b3020d91d57d Binary files /dev/null and b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/cockroachdb_metrics/screenshot.png differ diff --git a/src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/cockroachdb.svg b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/cockroachdb.svg new file mode 100644 index 0000000000000..72f0958f52824 --- /dev/null +++ b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/cockroachdb.svg @@ -0,0 +1,666 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/src/legacy/core_plugins/kibana/public/kibana.js b/src/legacy/core_plugins/kibana/public/kibana.js index 6c809e84c8c84..fe741a357cbfe 100644 --- a/src/legacy/core_plugins/kibana/public/kibana.js +++ b/src/legacy/core_plugins/kibana/public/kibana.js @@ -58,6 +58,9 @@ import 'ui/agg_response'; import 'ui/agg_types'; import { showAppRedirectNotification } from 'ui/notify'; import 'leaflet'; +import { localApplicationService } from './local_application_service'; + +localApplicationService.attachToAngular(routes); routes.enable(); diff --git a/src/legacy/server/index_patterns/service/index.ts b/src/legacy/core_plugins/kibana/public/local_application_service/index.ts similarity index 94% rename from src/legacy/server/index_patterns/service/index.ts rename to src/legacy/core_plugins/kibana/public/local_application_service/index.ts index 496c4ba7b5b6f..2128355ca906a 100644 --- a/src/legacy/server/index_patterns/service/index.ts +++ b/src/legacy/core_plugins/kibana/public/local_application_service/index.ts @@ -17,4 +17,4 @@ * under the License. */ -export * from './index_patterns_service'; +export * from './local_application_service'; diff --git a/src/legacy/core_plugins/kibana/public/local_application_service/local_application_service.ts b/src/legacy/core_plugins/kibana/public/local_application_service/local_application_service.ts new file mode 100644 index 0000000000000..9d87e187fd1e1 --- /dev/null +++ b/src/legacy/core_plugins/kibana/public/local_application_service/local_application_service.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 { App, AppUnmount } from 'kibana/public'; +import { UIRoutes } from 'ui/routes'; +import { ILocationService, IScope } from 'angular'; +import { npStart } from 'ui/new_platform'; +import { htmlIdGenerator } from '@elastic/eui'; + +interface ForwardDefinition { + legacyAppId: string; + newAppId: string; + keepPrefix: boolean; +} + +const matchAllWithPrefix = (prefixOrApp: string | App) => + `/${typeof prefixOrApp === 'string' ? prefixOrApp : prefixOrApp.id}/:tail*?`; + +/** + * To be able to migrate and shim parts of the Kibana app plugin + * while still running some parts of it in the legacy world, this + * service emulates the core application service while using the global + * angular router to switch between apps without page reload. + * + * The id of the apps is used as prefix of the route - when switching between + * to apps, the current application is unmounted. + * + * This service becomes unnecessary once the platform provides a central + * router that handles switching between applications without page reload. + */ +export class LocalApplicationService { + private apps: App[] = []; + private forwards: ForwardDefinition[] = []; + private idGenerator = htmlIdGenerator('kibanaAppLocalApp'); + + /** + * Register an app to be managed by the application service. + * This method works exactly as `core.application.register`. + * + * When an app is mounted, it is responsible for routing. The app + * won't be mounted again if the route changes within the prefix + * of the app (its id). It is fine to use whatever means for handling + * routing within the app. + * + * When switching to a URL outside of the current prefix, the app router + * shouldn't do anything because it doesn't own the routing anymore - + * the local application service takes over routing again, + * unmounts the current app and mounts the next app. + * + * @param app The app descriptor + */ + register(app: App) { + this.apps.push(app); + } + + /** + * Forwards every URL starting with `legacyAppId` to the same URL starting + * with `newAppId` - e.g. `/legacy/my/legacy/path?q=123` gets forwarded to + * `/newApp/my/legacy/path?q=123`. + * + * When setting the `keepPrefix` option, the new app id is simply prepended. + * The example above would become `/newApp/legacy/my/legacy/path?q=123`. + * + * This method can be used to provide backwards compatibility for URLs when + * renaming or nesting plugins. For route changes after the prefix, please + * use the routing mechanism of your app. + * + * @param legacyAppId The name of the old app to forward URLs from + * @param newAppId The name of the new app that handles the URLs now + * @param options Whether the prefix of the old app is kept to nest the legacy + * path into the new path + */ + forwardApp( + legacyAppId: string, + newAppId: string, + options: { keepPrefix: boolean } = { keepPrefix: false } + ) { + this.forwards.push({ legacyAppId, newAppId, ...options }); + } + + /** + * Wires up listeners to handle mounting and unmounting of apps to + * the legacy angular route manager. Once all apps within the Kibana + * plugin are using the local route manager, this implementation can + * be switched to a more lightweight implementation. + * + * @param angularRouteManager The current `ui/routes` instance + */ + attachToAngular(angularRouteManager: UIRoutes) { + this.apps.forEach(app => { + const wrapperElementId = this.idGenerator(); + angularRouteManager.when(matchAllWithPrefix(app), { + outerAngularWrapperRoute: true, + reloadOnSearch: false, + reloadOnUrl: false, + template: `
`, + controller($scope: IScope) { + const element = document.getElementById(wrapperElementId)!; + let unmountHandler: AppUnmount | null = null; + let isUnmounted = false; + $scope.$on('$destroy', () => { + if (unmountHandler) { + unmountHandler(); + } + isUnmounted = true; + }); + (async () => { + unmountHandler = await app.mount({ core: npStart.core }, { element, appBasePath: '' }); + // immediately unmount app if scope got destroyed in the meantime + if (isUnmounted) { + unmountHandler(); + } + })(); + }, + }); + }); + + this.forwards.forEach(({ legacyAppId, newAppId, keepPrefix }) => { + angularRouteManager.when(matchAllWithPrefix(legacyAppId), { + resolveRedirectTo: ($location: ILocationService) => { + const url = $location.url(); + return `/${newAppId}${keepPrefix ? url : url.replace(legacyAppId, '')}`; + }, + }); + }); + } +} + +export const localApplicationService = new LocalApplicationService(); diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap index 08a8cf3898e94..8e7ae33a60068 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap +++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap @@ -463,7 +463,7 @@ exports[`Field for boolean setting should render as read only if saving is disab display="row" error={null} fullWidth={false} - hasChildLabel={true} + hasChildLabel={false} hasEmptyLabelSpace={false} helpText={null} isInvalid={false} @@ -557,7 +557,7 @@ exports[`Field for boolean setting should render as read only with help text if display="row" error={null} fullWidth={false} - hasChildLabel={true} + hasChildLabel={false} hasEmptyLabelSpace={false} helpText={ diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js index e52f789eb8af7..a953d09906ed1 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js +++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js @@ -195,7 +195,7 @@ export class Field extends PureComponent { this.setState({ unsavedValue: newUnsavedValue, isInvalid, - error + error, }); }; @@ -764,6 +764,7 @@ export class Field extends PureComponent { helpText={this.renderHelpText(setting)} describedByIds={[`${setting.name}-aria`]} className="mgtAdvancedSettings__fieldRow" + hasChildLabel={setting.type !== 'boolean'} > {this.renderField(setting)} diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.html b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.html index 50e921e14973b..0ef3cce832bc7 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.html +++ b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.html @@ -72,14 +72,6 @@ index-patterns="[indexPattern]" > - -
-
+

diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js index b24cf447d21d6..c0a7615f207ed 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js +++ b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js @@ -22,43 +22,49 @@ import { Subscription } from 'rxjs'; import { i18n } from '@kbn/i18n'; import '../saved_visualizations/saved_visualizations'; import './visualization_editor'; -import 'ui/vis/editors/default/sidebar'; -import 'ui/visualize'; -import 'ui/collapsible_sidebar'; +import './visualization'; -import { capabilities } from 'ui/capabilities'; -import chrome from 'ui/chrome'; import React from 'react'; -import angular from 'angular'; import { FormattedMessage } from '@kbn/i18n/react'; -import { toastNotifications } from 'ui/notify'; -import { docTitle } from 'ui/doc_title'; -import { FilterBarQueryFilterProvider } from 'ui/filter_manager/query_filter'; -import { stateMonitorFactory } from 'ui/state_management/state_monitor_factory'; import { migrateAppState } from './lib'; -import uiRoutes from 'ui/routes'; -import { uiModules } from 'ui/modules'; import editorTemplate from './editor.html'; 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/migrate_legacy_query'; -import { subscribeWithScope } from 'ui/utils/subscribe_with_scope'; -import { timefilter } from 'ui/timefilter'; -import { getVisualizeLoader } from '../../../../../ui/public/visualize/loader'; -import { showShareContextMenu, ShareContextMenuExtensionsRegistryProvider } from 'ui/share'; -import { getUnhashableStatesProvider } from 'ui/state_management/state_hashing'; -import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal'; -import { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal'; import { getEditBreadcrumbs, getCreateBreadcrumbs } from '../breadcrumbs'; -import { npStart } from 'ui/new_platform'; import { extractTimeFilter, changeTimeFilter } from '../../../../data/public'; -import { start as data } from '../../../../data/public/legacy'; -import { start as visualizations } from '../../../../visualizations/public/np_ready/public/legacy'; import { addHelpMenuToAppChrome } from '../help_menu/help_menu_util'; +import { + getServices, + angular, + absoluteToParsedUrl, + getUnhashableStatesProvider, + KibanaParsedUrl, + migrateLegacyQuery, + SavedObjectSaveModal, + showShareContextMenu, + showSaveModal, + stateMonitorFactory, + subscribeWithScope, +} from '../kibana_services'; + +const { + capabilities, + chrome, + chromeLegacy, + data, + docTitle, + FilterBarQueryFilterProvider, + getBasePath, + ShareContextMenuExtensionsRegistryProvider, + toastNotifications, + timefilter, + uiModules, + uiRoutes, + visualizations, +} = getServices(); + const { savedQueryService } = data.search.services; uiRoutes @@ -100,7 +106,7 @@ uiRoutes savedVis: function (savedVisualizations, redirectWhenMissing, $route) { return savedVisualizations.get($route.current.params.id) .then((savedVis) => { - npStart.core.chrome.recentlyAccessed.add( + chrome.recentlyAccessed.add( savedVis.getFullPath(), savedVis.title, savedVis.id); @@ -142,6 +148,7 @@ function VisEditor( AppState, $window, $injector, + $timeout, indexPatterns, kbnUrl, redirectWhenMissing, @@ -167,7 +174,7 @@ function VisEditor( dirty: !savedVis.id }; - $scope.topNavMenu = [...(capabilities.get().visualize.save ? [{ + $scope.topNavMenu = [...(capabilities.visualize.save ? [{ id: 'save', label: i18n.translate('kbn.topNavMenu.saveVisualizationButtonLabel', { defaultMessage: 'save' }), description: i18n.translate('kbn.visualize.topNavMenu.saveVisualizationButtonAriaLabel', { @@ -236,7 +243,7 @@ function VisEditor( showShareContextMenu({ anchorElement, allowEmbed: true, - allowShortUrl: capabilities.get().visualize.createShortUrl, + allowShortUrl: capabilities.visualize.createShortUrl, getUnhashableStates, objectId: savedVis.id, objectType: 'visualization', @@ -353,9 +360,9 @@ function VisEditor( } }); - $scope.showSaveQuery = capabilities.get().visualize.saveQuery; + $scope.showSaveQuery = capabilities.visualize.saveQuery; - $scope.$watch(() => capabilities.get().visualize.saveQuery, (newCapability) => { + $scope.$watch(() => capabilities.visualize.saveQuery, (newCapability) => { $scope.showSaveQuery = newCapability; }); @@ -403,22 +410,21 @@ function VisEditor( $appStatus.dirty = status.dirty || !savedVis.id; }); - $scope.$watch('state.query', (newQuery) => { - const query = migrateLegacyQuery(newQuery); - $scope.updateQueryAndFetch({ query }); + $scope.$watch('state.query', (newQuery, oldQuery) => { + if (!_.isEqual(newQuery, oldQuery)) { + const query = migrateLegacyQuery(newQuery); + if (!_.isEqual(query, newQuery)) { + $state.query = query; + } + $scope.fetch(); + } }); $state.replace(); const updateTimeRange = () => { $scope.timeRange = timefilter.getTime(); - // In case we are running in embedded mode (i.e. we used the visualize loader to embed) - // the visualization, we need to update the timeRange on the visualize handler. - if ($scope._handler) { - $scope._handler.update({ - timeRange: $scope.timeRange, - }); - } + $scope.$broadcast('render'); }; const subscriptions = new Subscription(); @@ -435,9 +441,10 @@ function VisEditor( // update the searchSource when query updates $scope.fetch = function () { $state.save(); + $scope.query = $state.query; savedVis.searchSource.setField('query', $state.query); savedVis.searchSource.setField('filter', $state.filters); - $scope.vis.forceReload(); + $scope.$broadcast('render'); }; // update the searchSource when filters update @@ -460,16 +467,8 @@ function VisEditor( subscriptions.unsubscribe(); }); - if (!$scope.chrome.getVisible()) { - getVisualizeLoader().then(loader => { - $scope._handler = loader.embedVisualizationWithSavedObject($element.find('.visualize')[0], savedVis, { - timeRange: $scope.timeRange, - uiState: $scope.uiState, - appState: $state, - listenOnChange: false - }); - }); - } + + $timeout(() => { $scope.$broadcast('render'); }); } $scope.updateQueryAndFetch = function ({ query, dateRange }) { @@ -482,7 +481,9 @@ function VisEditor( timefilter.setTime(dateRange); // If nothing has changed, trigger the fetch manually, otherwise it will happen as a result of the changes - if (!isUpdate) $scope.fetch(); + if (!isUpdate) { + $scope.vis.forceReload(); + } }; $scope.onRefreshChange = function ({ isPaused, refreshInterval }) { @@ -582,7 +583,7 @@ function VisEditor( if ($scope.isAddToDashMode()) { const savedVisualizationParsedUrl = new KibanaParsedUrl({ - basePath: chrome.getBasePath(), + basePath: getBasePath(), appId: kbnBaseUrl.slice('/app/'.length), appPath: kbnUrl.eval(`${VisualizeConstants.EDIT_PATH}/{{id}}`, { id: savedVis.id }), }); @@ -591,15 +592,15 @@ function VisEditor( // Since we aren't reloading the page, only inserting a new browser history item, we need to manually update // the last url for this app, so directly clicking on the Visualize tab will also bring the user to the saved // url, not the unsaved one. - chrome.trackSubUrlForApp('kibana:visualize', savedVisualizationParsedUrl); + chromeLegacy.trackSubUrlForApp('kibana:visualize', savedVisualizationParsedUrl); - const lastDashboardAbsoluteUrl = npStart.core.chrome.navLinks.get('kibana:dashboard').url; - const dashboardParsedUrl = absoluteToParsedUrl(lastDashboardAbsoluteUrl, chrome.getBasePath()); + const lastDashboardAbsoluteUrl = chrome.navLinks.get('kibana:dashboard').url; + const dashboardParsedUrl = absoluteToParsedUrl(lastDashboardAbsoluteUrl, getBasePath()); dashboardParsedUrl.addQueryParameter(DashboardConstants.NEW_VISUALIZATION_ID_PARAM, savedVis.id); kbnUrl.change(dashboardParsedUrl.appPath); } else if (savedVis.id === $route.current.params.id) { docTitle.change(savedVis.lastSavedTitle); - chrome.breadcrumbs.set($injector.invoke(getEditBreadcrumbs)); + chrome.setBreadcrumbs($injector.invoke(getEditBreadcrumbs)); savedVis.vis.title = savedVis.title; savedVis.vis.description = savedVis.description; // it's needed to save the state to update url string diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/visualization.js b/src/legacy/core_plugins/kibana/public/visualize/editor/visualization.js new file mode 100644 index 0000000000000..198fbe19a0b7a --- /dev/null +++ b/src/legacy/core_plugins/kibana/public/visualize/editor/visualization.js @@ -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 { getServices } from '../kibana_services'; + +const { embeddables, uiModules } = getServices(); + +uiModules + .get('kibana/directive', ['ngSanitize']) + .directive('visualizationEmbedded', function (Private, $timeout, getAppState) { + + return { + restrict: 'E', + scope: { + savedObj: '=', + uiState: '=?', + timeRange: '=', + filters: '=', + query: '=', + }, + link: function ($scope, element) { + $scope.renderFunction = async () => { + if (!$scope._handler) { + $scope._handler = await embeddables.getEmbeddableFactory('visualization').createFromObject($scope.savedObj, { + timeRange: $scope.timeRange, + filters: $scope.filters || [], + query: $scope.query, + appState: getAppState(), + uiState: $scope.uiState, + }); + $scope._handler.render(element[0]); + + } else { + $scope._handler.updateInput({ + timeRange: $scope.timeRange, + filters: $scope.filters || [], + query: $scope.query, + }); + } + }; + + $scope.$on('render', (event) => { + event.preventDefault(); + $timeout(() => { $scope.renderFunction(); }); + }); + + $scope.$on('$destroy', () => { + $scope._handler.destroy(); + }); + } + }; + }); diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/visualization_editor.js b/src/legacy/core_plugins/kibana/public/visualize/editor/visualization_editor.js index a2ed44df2f5b0..ead77e6bc41d5 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/editor/visualization_editor.js +++ b/src/legacy/core_plugins/kibana/public/visualize/editor/visualization_editor.js @@ -17,10 +17,9 @@ * under the License. */ -import { debounce } from 'lodash'; -import { uiModules } from 'ui/modules'; -import 'angular-sanitize'; -import { VisEditorTypesRegistryProvider } from 'ui/registry/vis_editor_types'; +import { getServices, VisEditorTypesRegistryProvider } from '../kibana_services'; + +const { uiModules } = getServices(); uiModules .get('kibana/directive', ['ngSanitize']) @@ -34,6 +33,7 @@ uiModules uiState: '=?', timeRange: '=', filters: '=', + query: '=', }, link: function ($scope, element) { const editorType = $scope.savedObj.vis.type.editor; @@ -46,6 +46,7 @@ uiModules uiState: $scope.uiState, timeRange: $scope.timeRange, filters: $scope.filters, + query: $scope.query, appState: getAppState(), }); }; @@ -58,10 +59,6 @@ uiModules $scope.$on('$destroy', () => { editor.destroy(); }); - - $scope.$watchGroup(['timeRange', 'filters'], debounce(() => { - $scope.renderFunction(); - }, 100)); } }; }); diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/disabled_lab_embeddable.tsx b/src/legacy/core_plugins/kibana/public/visualize/embeddable/disabled_lab_embeddable.tsx index 92bd0fa345fa0..065feae045597 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/embeddable/disabled_lab_embeddable.tsx +++ b/src/legacy/core_plugins/kibana/public/visualize/embeddable/disabled_lab_embeddable.tsx @@ -19,7 +19,8 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import { Embeddable, EmbeddableOutput } from '../../../../../../plugins/embeddable/public'; + +import { Embeddable, EmbeddableOutput } from '../kibana_services'; import { DisabledLabVisualization } from './disabled_lab_visualization'; import { VisualizeInput } from './visualize_embeddable'; import { VISUALIZE_EMBEDDABLE_TYPE } from './constants'; diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/get_index_pattern.ts b/src/legacy/core_plugins/kibana/public/visualize/embeddable/get_index_pattern.ts index 699fa68b4528b..b6d5adcd98bd0 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/embeddable/get_index_pattern.ts +++ b/src/legacy/core_plugins/kibana/public/visualize/embeddable/get_index_pattern.ts @@ -17,9 +17,14 @@ * under the License. */ -import chrome from 'ui/chrome'; -import { StaticIndexPattern, getFromSavedObject } from 'ui/index_patterns'; -import { VisSavedObject } from 'ui/visualize/loader/types'; +import { + getServices, + getFromSavedObject, + StaticIndexPattern, + VisSavedObject, +} from '../kibana_services'; + +const { savedObjectsClient, uiSettings } = getServices(); export async function getIndexPattern( savedVis: VisSavedObject @@ -28,9 +33,7 @@ export async function getIndexPattern( return savedVis.vis.indexPattern; } - const config = chrome.getUiSettingsClient(); - const savedObjectsClient = chrome.getSavedObjectsClient(); - const defaultIndex = config.get('defaultIndex'); + const defaultIndex = uiSettings.get('defaultIndex'); if (savedVis.vis.params.index_pattern) { const indexPatternObjects = await savedObjectsClient.find({ diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable.ts b/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable.ts index b9febc3af54ea..318686b26f6f2 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable.ts +++ b/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable.ts @@ -18,27 +18,30 @@ */ import _ from 'lodash'; -import { StaticIndexPattern } from 'ui/index_patterns'; -import { PersistedState } from 'ui/persisted_state'; -import { VisualizeLoader } from 'ui/visualize/loader'; import { EmbeddedVisualizeHandler } from 'ui/visualize/loader/embedded_visualize_handler'; -import { - VisSavedObject, - VisualizeLoaderParams, - VisualizeUpdateParams, -} from 'ui/visualize/loader/types'; import { Subscription } from 'rxjs'; import * as Rx from 'rxjs'; -import { Filter } from '@kbn/es-query'; -import { TimeRange } from '../../../../../../plugins/data/public'; import { + TimeRange, + onlyDisabledFiltersChanged, + esFilters, +} from '../../../../../../plugins/data/public'; +import { Query } from '../../../../data/public'; +import { VISUALIZE_EMBEDDABLE_TYPE } from './constants'; + +import { + AppState, + Container, + Embeddable, EmbeddableInput, EmbeddableOutput, - Embeddable, - Container, -} from '../../../../../../plugins/embeddable/public'; -import { Query, onlyDisabledFiltersChanged } from '../../../../data/public'; -import { VISUALIZE_EMBEDDABLE_TYPE } from './constants'; + PersistedState, + StaticIndexPattern, + VisSavedObject, + VisualizeLoader, + VisualizeLoaderParams, + VisualizeUpdateParams, +} from '../kibana_services'; const getKeys = (o: T): Array => Object.keys(o) as Array; @@ -48,15 +51,19 @@ export interface VisualizeEmbeddableConfiguration { editUrl: string; loader: VisualizeLoader; editable: boolean; + appState?: AppState; + uiState?: PersistedState; } export interface VisualizeInput extends EmbeddableInput { timeRange?: TimeRange; query?: Query; - filters?: Filter[]; + filters?: esFilters.Filter[]; vis?: { colors?: { [key: string]: string }; }; + appState?: AppState; + uiState?: PersistedState; } export interface VisualizeOutput extends EmbeddableOutput { @@ -69,12 +76,13 @@ export interface VisualizeOutput extends EmbeddableOutput { export class VisualizeEmbeddable extends Embeddable { private savedVisualization: VisSavedObject; private loader: VisualizeLoader; + private appState: AppState | undefined; private uiState: PersistedState; private handler?: EmbeddedVisualizeHandler; private timeRange?: TimeRange; private query?: Query; private title?: string; - private filters?: Filter[]; + private filters?: esFilters.Filter[]; private visCustomizations: VisualizeInput['vis']; private subscription: Subscription; public readonly type = VISUALIZE_EMBEDDABLE_TYPE; @@ -86,6 +94,8 @@ export class VisualizeEmbeddable extends Embeddable { this.handleChanges(); @@ -149,7 +165,7 @@ export class VisualizeEmbeddable extends Embeddable & { id: string }, parent?: Container ): Promise { - const $injector = await chrome.dangerouslyGetActiveInjector(); + const $injector = await getInjector(); const config = $injector.get('config'); const savedVisualizations = $injector.get('savedVisualizations'); try { - const visId = savedObjectId; + const visId = savedObject.id as string; - const editUrl = chrome.addBasePath(`/app/kibana${savedVisualizations.urlFor(visId)}`); + const editUrl = visId ? addBasePath(`/app/kibana${savedVisualizations.urlFor(visId)}`) : ''; const loader = await getVisualizeLoader(); - const savedObject = await savedVisualizations.get(visId); const isLabsEnabled = config.get('visualize:enableLabs'); if (!isLabsEnabled && savedObject.vis.type.stage === 'experimental') { @@ -160,6 +147,8 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory< indexPatterns, editUrl, editable: this.isEditable(), + appState: input.appState, + uiState: input.uiState, }, input, parent @@ -170,6 +159,25 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory< } } + public async createFromSavedObject( + savedObjectId: string, + input: Partial & { id: string }, + parent?: Container + ): Promise { + const $injector = await getInjector(); + const savedVisualizations = $injector.get('savedVisualizations'); + + try { + const visId = savedObjectId; + + const savedObject = await savedVisualizations.get(visId); + return this.createFromObject(savedObject, input, parent); + } catch (e) { + console.error(e); // eslint-disable-line no-console + return new ErrorEmbeddable(e, input, parent); + } + } + public async create() { // TODO: This is a bit of a hack to preserve the original functionality. Ideally we will clean this up // to allow for in place creation of visualizations without having to navigate away to a new URL. @@ -183,8 +191,5 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory< } VisualizeEmbeddableFactory.createVisualizeEmbeddableFactory().then(embeddableFactory => { - npSetup.plugins.embeddable.registerEmbeddableFactory( - VISUALIZE_EMBEDDABLE_TYPE, - embeddableFactory - ); + embeddable.registerEmbeddableFactory(VISUALIZE_EMBEDDABLE_TYPE, embeddableFactory); }); diff --git a/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu.js b/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu.js index d95f7ea85c5db..40a1b79ea3520 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu.js +++ b/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu.js @@ -20,7 +20,10 @@ import React, { Fragment, PureComponent } from 'react'; import { EuiButton, EuiHorizontalRule, EuiSpacer } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; -import { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } from 'ui/documentation_links'; + +import { getServices } from '../kibana_services'; + +const { docLinks } = getServices(); export class HelpMenu extends PureComponent { render() { @@ -31,7 +34,7 @@ export class HelpMenu extends PureComponent { diff --git a/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu_util.js b/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu_util.js index aeabff2d97007..58a92193de63e 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu_util.js +++ b/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu_util.js @@ -22,7 +22,7 @@ import { render, unmountComponentAtNode } from 'react-dom'; import { HelpMenu } from './help_menu'; export function addHelpMenuToAppChrome(chrome) { - chrome.helpExtension.set(domElement => { + chrome.setHelpExtension(domElement => { render(, domElement); return () => { unmountComponentAtNode(domElement); diff --git a/src/legacy/core_plugins/kibana/public/visualize/index.js b/src/legacy/core_plugins/kibana/public/visualize/index.js index b3c16fb94d7fb..592a355a71b0d 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/index.js +++ b/src/legacy/core_plugins/kibana/public/visualize/index.js @@ -21,16 +21,14 @@ import './editor/editor'; import { i18n } from '@kbn/i18n'; import './saved_visualizations/_saved_vis'; import './saved_visualizations/saved_visualizations'; -import uiRoutes from 'ui/routes'; -import 'ui/capabilities/route_setup'; import visualizeListingTemplate from './listing/visualize_listing.html'; import { VisualizeListingController } from './listing/visualize_listing'; import { VisualizeConstants } from './visualize_constants'; -import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/registry/feature_catalogue'; import { getLandingBreadcrumbs, getWizardStep1Breadcrumbs } from './breadcrumbs'; -// load directives -import '../../../data/public'; +import { getServices, FeatureCatalogueCategory } from './kibana_services'; + +const { FeatureCatalogueRegistryProvider, uiRoutes } = getServices(); uiRoutes .defaults(/visualize/, { diff --git a/src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts b/src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts new file mode 100644 index 0000000000000..7e8435bbdc65e --- /dev/null +++ b/src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts @@ -0,0 +1,132 @@ +/* + * 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-sanitize'; // used in visualization_editor.js and visualization.js +import 'ui/collapsible_sidebar'; // used in default editor +import 'ui/vis/editors/default/sidebar'; +// load directives +import '../../../data/public'; + +import { npStart } from 'ui/new_platform'; +import angular from 'angular'; // just used in editor.js +import chromeLegacy from 'ui/chrome'; + +import uiRoutes from 'ui/routes'; + +// @ts-ignore +import { docTitle } from 'ui/doc_title'; +import { FilterBarQueryFilterProvider } from 'ui/filter_manager/query_filter'; +import { wrapInI18nContext } from 'ui/i18n'; +// @ts-ignore +import { uiModules } from 'ui/modules'; +import { FeatureCatalogueRegistryProvider } from 'ui/registry/feature_catalogue'; +import { ShareContextMenuExtensionsRegistryProvider } from 'ui/share'; +import { timefilter } from 'ui/timefilter'; + +// Saved objects +import { SavedObjectsClientProvider } from 'ui/saved_objects'; +// @ts-ignore +import { SavedObjectProvider } from 'ui/saved_objects/saved_object'; +import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry'; + +import { createUiStatsReporter, METRIC_TYPE } from '../../../ui_metric/public'; +import { start as visualizations } from '../../../visualizations/public/np_ready/public/legacy'; +import { start as data } from '../../../data/public/legacy'; +import { start as embeddables } from '../../../../core_plugins/embeddable_api/public/np_ready/public/legacy'; + +const services = { + // new platform + addBasePath: npStart.core.http.basePath.prepend, + capabilities: npStart.core.application.capabilities, + chrome: npStart.core.chrome, + docLinks: npStart.core.docLinks, + embeddable: npStart.plugins.embeddable, + getBasePath: npStart.core.http.basePath.get, + savedObjectsClient: npStart.core.savedObjects.client, + toastNotifications: npStart.core.notifications.toasts, + uiSettings: npStart.core.uiSettings, + + data, + embeddables, + visualizations, + + // legacy + chromeLegacy, + docTitle, + FeatureCatalogueRegistryProvider, + FilterBarQueryFilterProvider, + getInjector: () => { + return chromeLegacy.dangerouslyGetActiveInjector(); + }, + SavedObjectProvider, + SavedObjectRegistryProvider, + SavedObjectsClientProvider, + ShareContextMenuExtensionsRegistryProvider, + timefilter, + uiModules, + uiRoutes, + wrapInI18nContext, + + createUiStatsReporter, +}; + +export function getServices() { + return services; +} + +// export legacy static dependencies +export { angular }; +export { getFromSavedObject } from 'ui/index_patterns'; +export { PersistedState } from 'ui/persisted_state'; +// @ts-ignore +export { VisEditorTypesRegistryProvider } from 'ui/registry/vis_editor_types'; +// @ts-ignore +export { getUnhashableStatesProvider } from 'ui/state_management/state_hashing'; +export { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal'; +export { showShareContextMenu } from 'ui/share'; +export { stateMonitorFactory } from 'ui/state_management/state_monitor_factory'; +export { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url'; +export { KibanaParsedUrl } from 'ui/url/kibana_parsed_url'; +export { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query'; +export { subscribeWithScope } from 'ui/utils/subscribe_with_scope'; +export { getVisualizeLoader } from 'ui/visualize/loader'; +export { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal'; +export { + Container, + Embeddable, + EmbeddableFactory, + EmbeddableInput, + EmbeddableOutput, + ErrorEmbeddable, +} from '../../../../../plugins/embeddable/public'; + +// export types +export { METRIC_TYPE }; +export { StaticIndexPattern } from 'ui/index_patterns'; +export { AppState } from 'ui/state_management/app_state'; +export { VisType } from 'ui/vis'; +export { VisualizeLoader } from 'ui/visualize/loader'; +export { + VisSavedObject, + VisualizeLoaderParams, + VisualizeUpdateParams, +} from 'ui/visualize/loader/types'; + +// export const +export { FeatureCatalogueCategory } from 'ui/registry/feature_catalogue'; diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/no_visualizations_prompt.js b/src/legacy/core_plugins/kibana/public/visualize/listing/no_visualizations_prompt.js index 54a6048a22daf..34b662838880e 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/listing/no_visualizations_prompt.js +++ b/src/legacy/core_plugins/kibana/public/visualize/listing/no_visualizations_prompt.js @@ -18,7 +18,8 @@ */ import React from 'react'; -import { injectI18n, FormattedMessage } from '@kbn/i18n/react'; +import { i18n } from '@kbn/i18n'; +import { FormattedMessage } from '@kbn/i18n/react'; import { KuiEmptyTablePrompt, @@ -27,7 +28,7 @@ import { KuiButtonIcon, } from '@kbn/ui-framework/components'; -function NoVisualizationsPromptUi({ onCreateVis, intl }) { +function NoVisualizationsPrompt({ onCreateVis }) { return ( } + icon={} > } - message={intl.formatMessage({ - id: 'kbn.visualize.listing.noVisualizationsText', + message={i18n.translate('kbn.visualize.listing.noVisualizationsText', { defaultMessage: `Looks like you don't have any visualizations. Let's create some!`, })} /> @@ -52,4 +52,4 @@ function NoVisualizationsPromptUi({ onCreateVis, intl }) { ); } -export const NoVisualizationsPrompt = injectI18n(NoVisualizationsPromptUi); +export { NoVisualizationsPrompt }; diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js b/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js index bb05ce34413db..f9e3a1a90115a 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js +++ b/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js @@ -17,21 +17,27 @@ * under the License. */ -import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry'; -import 'ui/directives/kbn_href'; -import { uiModules } from 'ui/modules'; -import { timefilter } from 'ui/timefilter'; -import chrome from 'ui/chrome'; -import { wrapInI18nContext } from 'ui/i18n'; -import { toastNotifications } from 'ui/notify'; import { addHelpMenuToAppChrome } from '../help_menu/help_menu_util'; -import { SavedObjectsClientProvider } from 'ui/saved_objects'; import { VisualizeListingTable } from './visualize_listing_table'; import { NewVisModal } from '../wizard/new_vis_modal'; import { VisualizeConstants } from '../visualize_constants'; -import { start as visualizations } from '../../../../visualizations/public/np_ready/public/legacy'; import { i18n } from '@kbn/i18n'; +import { getServices } from '../kibana_services'; + +const { + addBasePath, + chrome, + chromeLegacy, + SavedObjectRegistryProvider, + SavedObjectsClientProvider, + timefilter, + toastNotifications, + uiModules, + wrapInI18nContext, + visualizations, +} = getServices(); + const app = uiModules.get('app/visualize', ['ngRoute', 'react']); app.directive('visualizeListingTable', reactDirective => reactDirective(wrapInI18nContext(VisualizeListingTable)) @@ -55,11 +61,11 @@ export function VisualizeListingController($injector, createNewVis) { this.editItem = ({ editUrl }) => { // for visualizations the edit and view URLs are the same - window.location = chrome.addBasePath(editUrl); + window.location.href = addBasePath(editUrl); }; this.getViewUrl = ({ editUrl }) => { - return chrome.addBasePath(editUrl); + return addBasePath(editUrl); }; this.closeNewVisModal = () => { @@ -101,7 +107,7 @@ export function VisualizeListingController($injector, createNewVis) { }) ) .then(() => { - chrome.untrackNavLinksForDeletedSavedObjects(selectedItems.map(item => item.id)); + chromeLegacy.untrackNavLinksForDeletedSavedObjects(selectedItems.map(item => item.id)); }) .catch(error => { toastNotifications.addError(error, { @@ -112,7 +118,7 @@ export function VisualizeListingController($injector, createNewVis) { }); }; - chrome.breadcrumbs.set([ + chrome.setBreadcrumbs([ { text: i18n.translate('kbn.visualize.visualizeListingBreadcrumbsTitle', { defaultMessage: 'Visualize', diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js b/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js index c909b6003516f..fbd70a0d8c0f7 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js +++ b/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js @@ -19,69 +19,53 @@ import React, { Component, Fragment } from 'react'; import PropTypes from 'prop-types'; -import { injectI18n, FormattedMessage } from '@kbn/i18n/react'; +import { FormattedMessage } from '@kbn/i18n/react'; import { i18n } from '@kbn/i18n'; -import { capabilities } from 'ui/capabilities'; import { TableListView } from './../../table_list_view'; -import { - EuiIcon, - EuiBetaBadge, - EuiLink, - EuiButton, - EuiEmptyPrompt, -} from '@elastic/eui'; +import { EuiIcon, EuiBetaBadge, EuiLink, EuiButton, EuiEmptyPrompt } from '@elastic/eui'; -class VisualizeListingTableUi extends Component { +import { getServices } from '../kibana_services'; +const { capabilities } = getServices(); + +class VisualizeListingTable extends Component { constructor(props) { super(props); } render() { - const { intl } = this.props; return ( item.canDelete} initialFilter={''} noItemsFragment={this.getNoItemsMessage()} - entityName={ - intl.formatMessage({ - id: 'kbn.visualize.listing.table.entityName', - defaultMessage: 'visualization', - }) - } - entityNamePlural={ - intl.formatMessage({ - id: 'kbn.visualize.listing.table.entityNamePlural', - defaultMessage: 'visualizations', - }) - } - tableListTitle={ - intl.formatMessage({ - id: 'kbn.visualize.listing.table.listTitle', - defaultMessage: 'Visualizations', - }) - } + entityName={i18n.translate('kbn.visualize.listing.table.entityName', { + defaultMessage: 'visualization', + })} + entityNamePlural={i18n.translate('kbn.visualize.listing.table.entityNamePlural', { + defaultMessage: 'visualizations', + })} + tableListTitle={i18n.translate('kbn.visualize.listing.table.listTitle', { + defaultMessage: 'Visualizations', + })} /> ); } getTableColumns() { - const { intl } = this.props; const tableColumns = [ { field: 'title', - name: intl.formatMessage({ - id: 'kbn.visualize.listing.table.titleColumnName', + name: i18n.translate('kbn.visualize.listing.table.titleColumnName', { defaultMessage: 'Title', }), sortable: true, @@ -92,35 +76,29 @@ class VisualizeListingTableUi extends Component { > {field} - ) + ), }, { field: 'typeTitle', - name: intl.formatMessage({ - id: 'kbn.visualize.listing.table.typeColumnName', + name: i18n.translate('kbn.visualize.listing.table.typeColumnName', { defaultMessage: 'Type', }), sortable: true, - render: (field, record) => ( + render: (field, record) => ( {this.renderItemTypeIcon(record)} {record.typeTitle} {this.getBadge(record)} - ) + ), }, { field: 'description', - name: intl.formatMessage({ - id: 'kbn.dashboard.listing.table.descriptionColumnName', + name: i18n.translate('kbn.dashboard.listing.table.descriptionColumnName', { defaultMessage: 'Description', }), sortable: true, - render: (field, record) => ( - - {record.description} - - ) + render: (field, record) => {record.description}, }, ]; @@ -184,19 +162,13 @@ class VisualizeListingTableUi extends Component { />

); - } renderItemTypeIcon(item) { let icon; if (item.image) { icon = ( - + ); } else { icon = ( @@ -214,38 +186,40 @@ class VisualizeListingTableUi extends Component { getBadge(item) { if (item.stage === 'beta') { - return (); + return ( + + ); } else if (item.stage === 'experimental') { - return (); + return ( + + ); } } } -VisualizeListingTableUi.propTypes = { +VisualizeListingTable.propTypes = { deleteItems: PropTypes.func.isRequired, findItems: PropTypes.func.isRequired, createItem: PropTypes.func.isRequired, @@ -254,4 +228,4 @@ VisualizeListingTableUi.propTypes = { listingLimit: PropTypes.number.isRequired, }; -export const VisualizeListingTable = injectI18n(VisualizeListingTableUi); +export { VisualizeListingTable }; diff --git a/src/legacy/core_plugins/kibana/public/visualize/types.d.ts b/src/legacy/core_plugins/kibana/public/visualize/types.d.ts index b321e5563eb60..c83f7f5a5da8b 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/types.d.ts +++ b/src/legacy/core_plugins/kibana/public/visualize/types.d.ts @@ -17,7 +17,7 @@ * under the License. */ -import { VisSavedObject } from 'ui/visualize/loader/types'; +import { VisSavedObject } from './kibana_services'; export interface SavedVisualizations { urlFor: (id: string) => string; diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/__snapshots__/new_vis_modal.test.tsx.snap b/src/legacy/core_plugins/kibana/public/visualize/wizard/__snapshots__/new_vis_modal.test.tsx.snap index 341a839e9c776..4aa614b68ea23 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/wizard/__snapshots__/new_vis_modal.test.tsx.snap +++ b/src/legacy/core_plugins/kibana/public/visualize/wizard/__snapshots__/new_vis_modal.test.tsx.snap @@ -349,7 +349,11 @@ exports[`NewVisModal filter for visualization types should render as expected 1` as="div" autoFocus={true} disabled={false} - lockProps={Object {}} + lockProps={ + Object { + "style": undefined, + } + } noFocusGuards={false} persistentFocus={false} returnFocus={true} @@ -1627,7 +1631,11 @@ exports[`NewVisModal should render as expected 1`] = ` as="div" autoFocus={true} disabled={false} - lockProps={Object {}} + lockProps={ + Object { + "style": undefined, + } + } noFocusGuards={false} persistentFocus={false} returnFocus={true} diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.tsx b/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.tsx index 6b2f51c3dcf2b..99d9590e750fd 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.tsx +++ b/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.tsx @@ -20,14 +20,33 @@ import React from 'react'; import { mountWithIntl } from 'test_utils/enzyme_helpers'; -import { settingsGet } from './new_vis_modal.test.mocks'; - import { NewVisModal } from './new_vis_modal'; - -import { VisType } from 'ui/vis'; +import { VisType } from '../kibana_services'; import { TypesStart } from '../../../../visualizations/public/np_ready/public/types'; +jest.mock('../kibana_services', () => { + const mock = { + addBasePath: jest.fn(path => `root${path}`), + uiSettings: { get: jest.fn() }, + createUiStatsReporter: () => jest.fn(), + }; + + return { + getServices: () => mock, + VisType: {}, + METRIC_TYPE: 'metricType', + }; +}); + +import { getServices } from '../kibana_services'; + +beforeEach(() => { + jest.clearAllMocks(); +}); + describe('NewVisModal', () => { + const settingsGet = getServices().uiSettings.get as jest.Mock; + const defaultVisTypeParams = { hidden: false, visualization: class Controller { diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.tsx b/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.tsx index 31ddafb4ec719..420f0e5198056 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.tsx +++ b/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.tsx @@ -22,14 +22,15 @@ import React from 'react'; import { EuiModal, EuiOverlayMask } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import chrome from 'ui/chrome'; -import { VisType } from 'ui/vis'; import { VisualizeConstants } from '../visualize_constants'; -import { createUiStatsReporter, METRIC_TYPE } from '../../../../ui_metric/public'; import { SearchSelection } from './search_selection'; import { TypeSelection } from './type_selection'; import { TypesStart, VisTypeAlias } from '../../../../visualizations/public/np_ready/public/types'; +import { getServices, METRIC_TYPE, VisType } from '../kibana_services'; + +const { addBasePath, createUiStatsReporter, uiSettings } = getServices(); + interface TypeSelectionProps { isOpen: boolean; onClose: () => void; @@ -54,7 +55,7 @@ class NewVisModal extends React.Component void; visType: VisType; diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.test.tsx b/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.test.tsx index 7fd1df85cee06..382f475669f5d 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.test.tsx +++ b/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.test.tsx @@ -20,14 +20,21 @@ import React from 'react'; import { shallowWithIntl } from 'test_utils/enzyme_helpers'; import { NewVisHelp } from './new_vis_help'; -import chrome from 'ui/chrome'; -jest.doMock('ui/chrome'); +jest.mock('../../kibana_services', () => { + return { + getServices: () => ({ + addBasePath: jest.fn((url: string) => `testbasepath${url}`), + }), + }; +}); + +beforeEach(() => { + jest.clearAllMocks(); +}); describe('NewVisHelp', () => { it('should render as expected', () => { - (chrome.addBasePath as unknown) = (url: string) => `testbasepath${url}`; - expect( shallowWithIntl( { aliasUrl: '/my/fancy/new/thing', description: 'Some desc', highlighted: false, - icon: 'wahtever', + icon: 'whatever', name: 'whatever', promotion: { buttonText: 'Do it now!', diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.tsx b/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.tsx index 3877c01dcc672..44c36f7d17d55 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.tsx +++ b/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.tsx @@ -20,9 +20,10 @@ import { FormattedMessage } from '@kbn/i18n/react'; import React, { Fragment } from 'react'; import { EuiText, EuiButton } from '@elastic/eui'; -import chrome from 'ui/chrome'; import { VisTypeAliasListEntry } from './type_selection'; +import { getServices } from '../../kibana_services'; + interface Props { promotedTypes: VisTypeAliasListEntry[]; } @@ -42,7 +43,7 @@ export function NewVisHelp(props: Props) { {t.promotion!.description}

0 ? savedObjectsResponse.saved_objects[0] : null; + const fields = indexPattern ? JSON.parse(indexPattern.attributes.fields) : null; + const field = fields ? fields.find((field) => field.name === fieldName) : fieldName; + const body = getBody( { field, query, boolFilter }, autocompleteTerminateAfter, autocompleteTimeout ); + try { const response = await callWithRequest(req, 'search', { index, body }); - const buckets = get(response, 'aggregations.suggestions.buckets') || []; + const buckets = get(response, 'aggregations.suggestions.buckets') + || get(response, 'aggregations.nestedSuggestions.suggestions.buckets') + || []; const suggestions = map(buckets, 'key'); return suggestions; } catch (error) { @@ -55,7 +67,7 @@ function getBody({ field, query, boolFilter = [] }, terminateAfter, timeout) { // the amount of information that needs to be transmitted to the coordinating node const shardSize = 10; - return { + const body = { size: 0, timeout: `${timeout}ms`, terminate_after: terminateAfter, @@ -67,7 +79,7 @@ function getBody({ field, query, boolFilter = [] }, terminateAfter, timeout) { aggs: { suggestions: { terms: { - field, + field: field.name || field, include: `${getEscapedQuery(query)}.*`, execution_hint: executionHint, shard_size: shardSize, @@ -75,6 +87,22 @@ function getBody({ field, query, boolFilter = [] }, terminateAfter, timeout) { }, }, }; + + if (field.subType && field.subType.nested) { + return { + ...body, + aggs: { + nestedSuggestions: { + nested: { + path: field.subType.nested.path, + }, + aggs: body.aggs, + }, + } + }; + } + + return body; } function getEscapedQuery(query = '') { diff --git a/src/legacy/core_plugins/kibana/server/tutorials/cockroachdb_metrics/index.js b/src/legacy/core_plugins/kibana/server/tutorials/cockroachdb_metrics/index.js new file mode 100644 index 0000000000000..e05be3bda145f --- /dev/null +++ b/src/legacy/core_plugins/kibana/server/tutorials/cockroachdb_metrics/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/metricbeat_instructions'; + +export function cockroachdbMetricsSpecProvider(server, context) { + const moduleName = 'cockroachdb'; + return { + id: 'cockroachdbMetrics', + name: i18n.translate('kbn.server.tutorials.cockroachdbMetrics.nameTitle', { + defaultMessage: 'CockroachDB metrics', + }), + category: TUTORIAL_CATEGORY.METRICS, + shortDescription: i18n.translate('kbn.server.tutorials.cockroachdbMetrics.shortDescription', { + defaultMessage: 'Fetch monitoring metrics from the CockroachDB server.', + }), + longDescription: i18n.translate('kbn.server.tutorials.cockroachdbMetrics.longDescription', { + defaultMessage: 'The `cockroachdb` Metricbeat module fetches monitoring metrics from CockroachDB. \ +[Learn more]({learnMoreLink}).', + values: { + learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-cockroachdb.html', + }, + }), + euiIconType: '/plugins/kibana/home/tutorial_resources/logos/cockroachdb.svg', + artifacts: { + dashboards: [ + { + id: 'e3ba0c30-9766-11e9-9eea-6f554992ec1f', + linkLabel: i18n.translate('kbn.server.tutorials.cockroachdbMetrics.artifacts.dashboards.linkLabel', { + defaultMessage: 'CockroachDB metrics dashboard', + }), + isOverview: true + } + ], + exportedFields: { + documentationUrl: '{config.docs.beats.metricbeat}/exported-fields-cockroachdb.html' + } + }, + completionTimeMinutes: 10, + previewImagePath: '/plugins/kibana/home/tutorial_resources/cockroachdb_metrics/screenshot.png', + onPrem: onPremInstructions(moduleName, null, null, null, context), + elasticCloud: cloudInstructions(moduleName), + onPremElasticCloud: onPremCloudInstructions(moduleName) + }; +} diff --git a/src/legacy/core_plugins/kibana/server/tutorials/coredns_logs/index.js b/src/legacy/core_plugins/kibana/server/tutorials/coredns_logs/index.js index 69f31c623e5ef..ca308ac969e49 100644 --- a/src/legacy/core_plugins/kibana/server/tutorials/coredns_logs/index.js +++ b/src/legacy/core_plugins/kibana/server/tutorials/coredns_logs/index.js @@ -46,7 +46,7 @@ export function corednsLogsSpecProvider(server, context) { learnMoreLink: '{config.docs.beats.filebeat}/filebeat-module-coredns.html', }, }), - //TODO: euiIconType: 'logoCoredns', + euiIconType: '/plugins/kibana/home/tutorial_resources/logos/coredns.svg', artifacts: { dashboards: [ { diff --git a/src/legacy/core_plugins/kibana/server/tutorials/register.js b/src/legacy/core_plugins/kibana/server/tutorials/register.js index 70bc0f4d3c9eb..a95baad4ccb65 100644 --- a/src/legacy/core_plugins/kibana/server/tutorials/register.js +++ b/src/legacy/core_plugins/kibana/server/tutorials/register.js @@ -78,6 +78,7 @@ import { envoyproxyLogsSpecProvider } from './envoyproxy_logs'; import { couchdbMetricsSpecProvider } from './couchdb_metrics'; import { emsBoundariesSpecProvider } from './ems'; import { consulMetricsSpecProvider } from './consul_metrics'; +import { cockroachdbMetricsSpecProvider } from './cockroachdb_metrics'; export function registerTutorials(server) { server.registerTutorial(systemLogsSpecProvider); @@ -141,4 +142,5 @@ export function registerTutorials(server) { server.registerTutorial(couchdbMetricsSpecProvider); server.registerTutorial(emsBoundariesSpecProvider); server.registerTutorial(consulMetricsSpecProvider); + server.registerTutorial(cockroachdbMetricsSpecProvider); } diff --git a/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx b/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx index 803119bdac119..4f8c5d11f1916 100644 --- a/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx +++ b/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx @@ -29,7 +29,7 @@ jest.mock('ui/new_platform'); const dataShim = { ui: { - SearchBar: () =>
, + SearchBar: () =>
, }, }; diff --git a/src/legacy/core_plugins/telemetry/index.ts b/src/legacy/core_plugins/telemetry/index.ts index 3271373449eb3..4b6566415f3e1 100644 --- a/src/legacy/core_plugins/telemetry/index.ts +++ b/src/legacy/core_plugins/telemetry/index.ts @@ -48,6 +48,9 @@ const telemetry = (kibana: any) => { // `config` is used internally and not intended to be set config: Joi.string().default(Joi.ref('$defaultConfigPath')), banner: Joi.boolean().default(true), + lastVersionChecked: Joi.string() + .allow('') + .default(''), url: Joi.when('$dev', { is: true, then: Joi.string().default( @@ -77,7 +80,8 @@ const telemetry = (kibana: any) => { }, }, async replaceInjectedVars(originalInjectedVars: any, request: any) { - const telemetryOptedIn = await getTelemetryOptIn(request); + const currentKibanaVersion = getCurrentKibanaVersion(request.server); + const telemetryOptedIn = await getTelemetryOptIn({ request, currentKibanaVersion }); return { ...originalInjectedVars, @@ -97,7 +101,13 @@ const telemetry = (kibana: any) => { mappings, }, init(server: Server) { - const initializerContext = {} as PluginInitializerContext; + const initializerContext = { + env: { + packageInfo: { + version: getCurrentKibanaVersion(server), + }, + }, + } as PluginInitializerContext; const coreSetup = ({ http: { server }, @@ -116,3 +126,7 @@ const telemetry = (kibana: any) => { // eslint-disable-next-line import/no-default-export export default telemetry; + +function getCurrentKibanaVersion(server: Server): string { + return server.config().get('pkg.version'); +} diff --git a/src/legacy/core_plugins/telemetry/mappings.json b/src/legacy/core_plugins/telemetry/mappings.json index d83f7f5967630..1245ef88f5892 100644 --- a/src/legacy/core_plugins/telemetry/mappings.json +++ b/src/legacy/core_plugins/telemetry/mappings.json @@ -3,6 +3,9 @@ "properties": { "enabled": { "type": "boolean" + }, + "lastVersionChecked": { + "type": "keyword" } } } diff --git a/src/legacy/core_plugins/telemetry/server/get_telemetry_opt_in.test.ts b/src/legacy/core_plugins/telemetry/server/get_telemetry_opt_in.test.ts new file mode 100644 index 0000000000000..67ad3aaae427d --- /dev/null +++ b/src/legacy/core_plugins/telemetry/server/get_telemetry_opt_in.test.ts @@ -0,0 +1,214 @@ +/* + * 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 { getTelemetryOptIn } from './get_telemetry_opt_in'; + +describe('get_telemetry_opt_in', () => { + it('returns false when request path is not /app*', async () => { + const params = getCallGetTelemetryOptInParams({ + requestPath: '/foo/bar', + }); + + const result = await callGetTelemetryOptIn(params); + + expect(result).toBe(false); + }); + + it('returns null when saved object not found', async () => { + const params = getCallGetTelemetryOptInParams({ + savedObjectNotFound: true, + }); + + const result = await callGetTelemetryOptIn(params); + + expect(result).toBe(null); + }); + + it('returns false when saved object forbidden', async () => { + const params = getCallGetTelemetryOptInParams({ + savedObjectForbidden: true, + }); + + const result = await callGetTelemetryOptIn(params); + + expect(result).toBe(false); + }); + + it('throws an error on unexpected saved object error', async () => { + const params = getCallGetTelemetryOptInParams({ + savedObjectOtherError: true, + }); + + let threw = false; + try { + await callGetTelemetryOptIn(params); + } catch (err) { + threw = true; + expect(err.message).toBe(SavedObjectOtherErrorMessage); + } + + expect(threw).toBe(true); + }); + + it('returns null if enabled is null or undefined', async () => { + for (const enabled of [null, undefined]) { + const params = getCallGetTelemetryOptInParams({ + enabled, + }); + + const result = await callGetTelemetryOptIn(params); + + expect(result).toBe(null); + } + }); + + it('returns true when enabled is true', async () => { + const params = getCallGetTelemetryOptInParams({ + enabled: true, + }); + + const result = await callGetTelemetryOptIn(params); + + expect(result).toBe(true); + }); + + // build a table of tests with version checks, with results for enabled false + type VersionCheckTable = Array>; + + const EnabledFalseVersionChecks: VersionCheckTable = [ + { lastVersionChecked: '8.0.0', currentKibanaVersion: '8.0.0', result: false }, + { lastVersionChecked: '8.0.0', currentKibanaVersion: '8.0.1', result: false }, + { lastVersionChecked: '8.0.1', currentKibanaVersion: '8.0.0', result: false }, + { lastVersionChecked: '8.0.0', currentKibanaVersion: '8.1.0', result: null }, + { lastVersionChecked: '8.0.0', currentKibanaVersion: '9.0.0', result: null }, + { lastVersionChecked: '8.0.0', currentKibanaVersion: '7.0.0', result: false }, + { lastVersionChecked: '8.1.0', currentKibanaVersion: '8.0.0', result: false }, + { lastVersionChecked: '8.0.0-X', currentKibanaVersion: '8.0.0', result: false }, + { lastVersionChecked: '8.0.0', currentKibanaVersion: '8.0.0-X', result: false }, + { lastVersionChecked: null, currentKibanaVersion: '8.0.0', result: null }, + { lastVersionChecked: undefined, currentKibanaVersion: '8.0.0', result: null }, + { lastVersionChecked: 5, currentKibanaVersion: '8.0.0', result: null }, + { lastVersionChecked: '8.0.0', currentKibanaVersion: 'beta', result: null }, + { lastVersionChecked: 'beta', currentKibanaVersion: '8.0.0', result: null }, + { lastVersionChecked: 'beta', currentKibanaVersion: 'beta', result: false }, + { lastVersionChecked: 'BETA', currentKibanaVersion: 'beta', result: null }, + ].map(el => ({ ...el, enabled: false })); + + // build a table of tests with version checks, with results for enabled true/null/undefined + const EnabledTrueVersionChecks: VersionCheckTable = EnabledFalseVersionChecks.map(el => ({ + ...el, + enabled: true, + result: true, + })); + + const EnabledNullVersionChecks: VersionCheckTable = EnabledFalseVersionChecks.map(el => ({ + ...el, + enabled: null, + result: null, + })); + + const EnabledUndefinedVersionChecks: VersionCheckTable = EnabledFalseVersionChecks.map(el => ({ + ...el, + enabled: undefined, + result: null, + })); + + const AllVersionChecks = [ + ...EnabledFalseVersionChecks, + ...EnabledTrueVersionChecks, + ...EnabledNullVersionChecks, + ...EnabledUndefinedVersionChecks, + ]; + + test.each(AllVersionChecks)( + 'returns expected result for version check with %j', + async (params: Partial) => { + const result = await callGetTelemetryOptIn({ ...DefaultParams, ...params }); + expect(result).toBe(params.result); + } + ); +}); + +interface CallGetTelemetryOptInParams { + requestPath: string; + savedObjectNotFound: boolean; + savedObjectForbidden: boolean; + savedObjectOtherError: boolean; + enabled: boolean | null | undefined; + lastVersionChecked?: any; // should be a string, but test with non-strings + currentKibanaVersion: string; + result?: boolean | null; +} + +const DefaultParams = { + requestPath: '/app/something', + savedObjectNotFound: false, + savedObjectForbidden: false, + savedObjectOtherError: false, + enabled: true, + lastVersionChecked: '8.0.0', + currentKibanaVersion: '8.0.0', +}; + +function getCallGetTelemetryOptInParams( + overrides: Partial +): CallGetTelemetryOptInParams { + return { ...DefaultParams, ...overrides }; +} + +async function callGetTelemetryOptIn(params: CallGetTelemetryOptInParams): Promise { + const { currentKibanaVersion } = params; + const request = getMockRequest(params); + return await getTelemetryOptIn({ request, currentKibanaVersion }); +} + +function getMockRequest(params: CallGetTelemetryOptInParams): any { + return { + path: params.requestPath, + getSavedObjectsClient() { + return getMockSavedObjectsClient(params); + }, + }; +} + +const SavedObjectNotFoundMessage = 'savedObjectNotFound'; +const SavedObjectForbiddenMessage = 'savedObjectForbidden'; +const SavedObjectOtherErrorMessage = 'savedObjectOtherError'; + +function getMockSavedObjectsClient(params: CallGetTelemetryOptInParams) { + return { + async get(type: string, id: string) { + if (params.savedObjectNotFound) throw new Error(SavedObjectNotFoundMessage); + if (params.savedObjectForbidden) throw new Error(SavedObjectForbiddenMessage); + if (params.savedObjectOtherError) throw new Error(SavedObjectOtherErrorMessage); + + const enabled = params.enabled; + const lastVersionChecked = params.lastVersionChecked; + return { attributes: { enabled, lastVersionChecked } }; + }, + errors: { + isNotFoundError(error: any) { + return error.message === SavedObjectNotFoundMessage; + }, + isForbiddenError(error: any) { + return error.message === SavedObjectForbiddenMessage; + }, + }, + }; +} diff --git a/src/legacy/core_plugins/telemetry/server/get_telemetry_opt_in.ts b/src/legacy/core_plugins/telemetry/server/get_telemetry_opt_in.ts index 9b365d6dd7ae5..c8bd4a4b6dfbd 100644 --- a/src/legacy/core_plugins/telemetry/server/get_telemetry_opt_in.ts +++ b/src/legacy/core_plugins/telemetry/server/get_telemetry_opt_in.ts @@ -17,7 +17,21 @@ * under the License. */ -export async function getTelemetryOptIn(request: any) { +import semver from 'semver'; + +import { SavedObjectAttributes } from './routes/opt_in'; + +interface GetTelemetryOptIn { + request: any; + currentKibanaVersion: string; +} + +// Returns whether telemetry has been opt'ed into or not. +// Returns null not set, meaning Kibana should prompt in the UI. +export async function getTelemetryOptIn({ + request, + currentKibanaVersion, +}: GetTelemetryOptIn): Promise { const isRequestingApplication = request.path.startsWith('/app'); // Prevent interstitial screens (such as the space selector) from prompting for telemetry @@ -27,9 +41,9 @@ export async function getTelemetryOptIn(request: any) { const savedObjectsClient = request.getSavedObjectsClient(); + let savedObject; try { - const { attributes } = await savedObjectsClient.get('telemetry', 'telemetry'); - return attributes.enabled; + savedObject = await savedObjectsClient.get('telemetry', 'telemetry'); } catch (error) { if (savedObjectsClient.errors.isNotFoundError(error)) { return null; @@ -43,4 +57,50 @@ export async function getTelemetryOptIn(request: any) { throw error; } + + const { attributes }: { attributes: SavedObjectAttributes } = savedObject; + + // if enabled is already null, return null + if (attributes.enabled == null) return null; + + const enabled = !!attributes.enabled; + + // if enabled is true, return it + if (enabled === true) return enabled; + + // Additional check if they've already opted out (enabled: false): + // - if the Kibana version has changed by at least a minor version, + // return null to re-prompt. + + const lastKibanaVersion = attributes.lastVersionChecked; + + // if the last kibana version isn't set, or is somehow not a string, return null + if (typeof lastKibanaVersion !== 'string') return null; + + // if version hasn't changed, just return enabled value + if (lastKibanaVersion === currentKibanaVersion) return enabled; + + const lastSemver = parseSemver(lastKibanaVersion); + const currentSemver = parseSemver(currentKibanaVersion); + + // if either version is invalid, return null + if (lastSemver == null || currentSemver == null) return null; + + // actual major/minor version comparison, for cases when to return null + if (currentSemver.major > lastSemver.major) return null; + if (currentSemver.major === lastSemver.major) { + if (currentSemver.minor > lastSemver.minor) return null; + } + + // current version X.Y is not greater than last version X.Y, return enabled + return enabled; +} + +function parseSemver(version: string): semver.SemVer | null { + // semver functions both return nulls AND throw exceptions: "it depends!" + try { + return semver.parse(version); + } catch (err) { + return null; + } } diff --git a/src/legacy/core_plugins/telemetry/server/index.ts b/src/legacy/core_plugins/telemetry/server/index.ts index b8ae5fc231fba..aa13fab9a5f81 100644 --- a/src/legacy/core_plugins/telemetry/server/index.ts +++ b/src/legacy/core_plugins/telemetry/server/index.ts @@ -25,5 +25,5 @@ export { getTelemetryOptIn } from './get_telemetry_opt_in'; export { telemetryCollectionManager } from './collection_manager'; export const telemetryPlugin = (initializerContext: PluginInitializerContext) => - new TelemetryPlugin(); + new TelemetryPlugin(initializerContext); export { constants }; diff --git a/src/legacy/core_plugins/telemetry/server/plugin.ts b/src/legacy/core_plugins/telemetry/server/plugin.ts index 70de51b2abe99..a5f0f1234799a 100644 --- a/src/legacy/core_plugins/telemetry/server/plugin.ts +++ b/src/legacy/core_plugins/telemetry/server/plugin.ts @@ -17,14 +17,21 @@ * under the License. */ -import { CoreSetup } from 'src/core/server'; +import { CoreSetup, PluginInitializerContext } from 'src/core/server'; import { registerRoutes } from './routes'; import { telemetryCollectionManager } from './collection_manager'; import { getStats } from './telemetry_collection'; export class TelemetryPlugin { + private readonly currentKibanaVersion: string; + + constructor(initializerContext: PluginInitializerContext) { + this.currentKibanaVersion = initializerContext.env.packageInfo.version; + } + public setup(core: CoreSetup) { + const currentKibanaVersion = this.currentKibanaVersion; telemetryCollectionManager.setStatsGetter(getStats, 'local'); - registerRoutes(core); + registerRoutes({ core, currentKibanaVersion }); } } diff --git a/src/legacy/core_plugins/telemetry/server/routes/index.ts b/src/legacy/core_plugins/telemetry/server/routes/index.ts index 12ba541d699f9..2eb6bf95b4f45 100644 --- a/src/legacy/core_plugins/telemetry/server/routes/index.ts +++ b/src/legacy/core_plugins/telemetry/server/routes/index.ts @@ -21,7 +21,12 @@ import { CoreSetup } from 'src/core/server'; import { registerOptInRoutes } from './opt_in'; import { registerTelemetryDataRoutes } from './telemetry_stats'; -export function registerRoutes(core: CoreSetup) { - registerOptInRoutes(core); +interface RegisterRoutesParams { + core: CoreSetup; + currentKibanaVersion: string; +} + +export function registerRoutes({ core, currentKibanaVersion }: RegisterRoutesParams) { + registerOptInRoutes({ core, currentKibanaVersion }); registerTelemetryDataRoutes(core); } diff --git a/src/legacy/core_plugins/telemetry/server/routes/opt_in.ts b/src/legacy/core_plugins/telemetry/server/routes/opt_in.ts index aabc0259f08fc..3a7194890b570 100644 --- a/src/legacy/core_plugins/telemetry/server/routes/opt_in.ts +++ b/src/legacy/core_plugins/telemetry/server/routes/opt_in.ts @@ -21,7 +21,17 @@ import Joi from 'joi'; import { boomify } from 'boom'; import { CoreSetup } from 'src/core/server'; -export function registerOptInRoutes(core: CoreSetup) { +interface RegisterOptInRoutesParams { + core: CoreSetup; + currentKibanaVersion: string; +} + +export interface SavedObjectAttributes { + enabled?: boolean; + lastVersionChecked: string; +} + +export function registerOptInRoutes({ core, currentKibanaVersion }: RegisterOptInRoutesParams) { const { server } = core.http as any; server.route({ @@ -36,17 +46,16 @@ export function registerOptInRoutes(core: CoreSetup) { }, handler: async (req: any, h: any) => { const savedObjectsClient = req.getSavedObjectsClient(); + const savedObject: SavedObjectAttributes = { + enabled: req.payload.enabled, + lastVersionChecked: currentKibanaVersion, + }; + const options = { + id: 'telemetry', + overwrite: true, + }; try { - await savedObjectsClient.create( - 'telemetry', - { - enabled: req.payload.enabled, - }, - { - id: 'telemetry', - overwrite: true, - } - ); + await savedObjectsClient.create('telemetry', savedObject, options); } catch (err) { return boomify(err); } diff --git a/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js b/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js index 5b8bb07577510..ca798b6bf2470 100644 --- a/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js +++ b/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js @@ -21,9 +21,8 @@ import { get } from 'lodash'; import { GeohashLayer } from './geohash_layer'; import { BaseMapsVisualizationProvider } from './base_maps_visualization'; import { TileMapTooltipFormatterProvider } from './editors/_tooltip_formatter'; +import { npStart } from 'ui/new_platform'; import { getFormat } from '../../../ui/public/visualize/loader/pipeline_helpers/utilities'; -import { start as data } from '../../../core_plugins/data/public/legacy'; -const filterManager = data.filter.filterManager; export const createTileMapVisualization = ({ serviceSettings, $injector }) => { const BaseMapsVisualization = new BaseMapsVisualizationProvider(serviceSettings); @@ -189,6 +188,7 @@ export const createTileMapVisualization = ({ serviceSettings, $injector }) => { filter[filterName] = { ignore_unmapped: true }; filter[filterName][field] = filterData; + const { filterManager } = npStart.plugins.data.query; filterManager.addFilters([filter]); this.vis.updateState(); diff --git a/src/legacy/core_plugins/timelion/public/vis/timelion_request_handler.ts b/src/legacy/core_plugins/timelion/public/vis/timelion_request_handler.ts index eb4fb3f397149..156c06a605528 100644 --- a/src/legacy/core_plugins/timelion/public/vis/timelion_request_handler.ts +++ b/src/legacy/core_plugins/timelion/public/vis/timelion_request_handler.ts @@ -18,12 +18,12 @@ */ // @ts-ignore -import { buildEsQuery, getEsQueryConfig, Filter } from '@kbn/es-query'; +import { buildEsQuery, getEsQueryConfig } from '@kbn/es-query'; // @ts-ignore import { timezoneProvider } from 'ui/vis/lib/timezone'; import { KIBANA_CONTEXT_NAME } from 'src/plugins/expressions/public'; import { Query } from 'src/legacy/core_plugins/data/public'; -import { TimeRange } from 'src/plugins/data/public'; +import { TimeRange, esFilters } from 'src/plugins/data/public'; import { VisParams } from 'ui/vis'; import { i18n } from '@kbn/i18n'; import { TimelionVisualizationDependencies } from '../plugin'; @@ -60,7 +60,7 @@ export function getTimelionRequestHandler(dependencies: TimelionVisualizationDep visParams, }: { timeRange: TimeRange; - filters: Filter[]; + filters: esFilters.Filter[]; query: Query; visParams: VisParams; forceFetch?: boolean; diff --git a/src/legacy/core_plugins/ui_metric/public/services/telemetry_analytics.ts b/src/legacy/core_plugins/ui_metric/public/services/telemetry_analytics.ts index 63adccb3e02b0..7310ee5b5f172 100644 --- a/src/legacy/core_plugins/ui_metric/public/services/telemetry_analytics.ts +++ b/src/legacy/core_plugins/ui_metric/public/services/telemetry_analytics.ts @@ -47,14 +47,20 @@ interface AnalyicsReporterConfig { } export function createAnalyticsReporter(config: AnalyicsReporterConfig) { - const { localStorage, basePath, $http, debug } = config; + const { localStorage, basePath, debug } = config; return createReporter({ debug, storage: localStorage, async http(report) { const url = `${basePath}/api/telemetry/report`; - await $http.post(url, { report }); + await fetch(url, { + method: 'POST', + headers: { + 'kbn-xsrf': 'true', + }, + body: JSON.stringify({ report }), + }); }, }); } diff --git a/src/legacy/core_plugins/vis_type_metric/public/metric_vis_fn.ts b/src/legacy/core_plugins/vis_type_metric/public/metric_vis_fn.ts index 89f74ef4b53e9..3b2e503a01e38 100644 --- a/src/legacy/core_plugins/vis_type_metric/public/metric_vis_fn.ts +++ b/src/legacy/core_plugins/vis_type_metric/public/metric_vis_fn.ts @@ -171,7 +171,7 @@ export const createMetricVisFn = (): ExpressionFunction< throw new Error('colorRange must be provided when using percentage'); } - const fontSize = Number.parseInt(args.font.spec.fontSize, 10); + const fontSize = Number.parseInt(args.font.spec.fontSize || '', 10); return { type: 'render', diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor.js index 3497a35f5c99d..842d3aa6c4ad7 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor.js @@ -32,10 +32,10 @@ import { fetchFields } from '../lib/fetch_fields'; import { extractIndexPatterns } from '../../common/extract_index_patterns'; import { npStart } from 'ui/new_platform'; -import { Storage } from 'ui/storage'; + import { CoreStartContextProvider } from '../contexts/query_input_bar_context'; import { KibanaContextProvider } from '../../../../../plugins/kibana_react/public'; -const localStorage = new Storage(window.localStorage); +import { Storage } from '../../../../../plugins/kibana_utils/public'; import { timefilter } from 'ui/timefilter'; const VIS_STATE_DEBOUNCE_DELAY = 200; @@ -46,6 +46,7 @@ export class VisEditor extends Component { super(props); const { vis } = props; this.appState = vis.API.getAppState(); + this.localStorage = new Storage(window.localStorage); this.state = { model: props.visParams, dirty: false, @@ -63,7 +64,7 @@ export class VisEditor extends Component { appName: APP_NAME, uiSettings: npStart.core.uiSettings, savedObjectsClient: npStart.core.savedObjects.client, - store: localStorage, + store: this.localStorage, }; } @@ -169,7 +170,7 @@ export class VisEditor extends Component { { + this._subscription = this._handler.handler.data$.subscribe(data => { this.setPanelInterval(data.visData); onDataChange(data); }); @@ -152,10 +150,12 @@ class VisEditorVisualizationUI extends Component { this._loadVisualization(); } - componentDidUpdate(prevProps) { - if (this._handler && !isEqual(this.props.timeRange, prevProps.timeRange)) { - this._handler.update({ + componentDidUpdate() { + if (this._handler) { + this._handler.updateInput({ timeRange: this.props.timeRange, + filters: this.props.filters || [], + query: this.props.query, }); } } diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.test.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.test.js deleted file mode 100644 index e60626f8fbf0a..0000000000000 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.test.js +++ /dev/null @@ -1,71 +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. - */ - -jest.mock('ui/visualize/loader/visualize_loader', () => ({})); - -jest.mock('ui/new_platform'); - -import React from 'react'; -import { mountWithIntl } from 'test_utils/enzyme_helpers'; -import { VisEditorVisualization } from './vis_editor_visualization'; - -describe('getVisualizeLoader', () => { - let updateStub; - - beforeEach(() => { - updateStub = jest.fn(); - const handlerMock = { - update: updateStub, - data$: { - subscribe: () => {}, - }, - }; - const loaderMock = { - embedVisualizationWithSavedObject: () => handlerMock, - }; - require('ui/visualize/loader/visualize_loader').getVisualizeLoader = async () => loaderMock; - }); - - it('should not call _handler.update until getVisualizeLoader returns _handler', async () => { - const wrapper = mountWithIntl(); - - // Set prop to force DOM change and componentDidUpdate to be triggered - wrapper.setProps({ - timeRange: { - from: '2019-03-20T20:35:37.637Z', - to: '2019-03-23T18:40:16.486Z', - }, - }); - - expect(updateStub).not.toHaveBeenCalled(); - - // Ensure all promises resolve - await new Promise(resolve => process.nextTick(resolve)); - - // Set prop to force DOM change and componentDidUpdate to be triggered - wrapper.setProps({ - timeRange: { - from: 'now/d', - to: 'now/d', - }, - }); - - expect(updateStub).toHaveBeenCalled(); - }); -}); diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/contexts/query_input_bar_context.ts b/src/legacy/core_plugins/vis_type_timeseries/public/contexts/query_input_bar_context.ts index 19519571f1ab0..925b483905d01 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/contexts/query_input_bar_context.ts +++ b/src/legacy/core_plugins/vis_type_timeseries/public/contexts/query_input_bar_context.ts @@ -18,14 +18,14 @@ */ import React from 'react'; -import { Storage } from 'ui/storage'; import { UiSettingsClientContract, SavedObjectsClientContract } from 'src/core/public'; +import { IStorageWrapper } from 'src/plugins/kibana_utils/public'; export interface ICoreStartContext { appName: string; uiSettings: UiSettingsClientContract; savedObjectsClient: SavedObjectsClientContract; - store: Storage; + storage: IStorageWrapper; } export const CoreStartContext = React.createContext(null); diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_index_pattern_service.js b/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_index_pattern_service.js index 0766e6a48765f..54e90ab7dd9b7 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_index_pattern_service.js +++ b/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_index_pattern_service.js @@ -17,7 +17,7 @@ * under the License. */ -import { IndexPatternsService } from '../../../../server/index_patterns/service'; +import { IndexPatternsFetcher } from '../../../../../plugins/data/server/'; export const getIndexPatternService = { assign: 'indexPatternsService', method(req) { @@ -25,6 +25,6 @@ export const getIndexPatternService = { const callDataCluster = (...args) => { return dataCluster.callWithRequest(req, ...args); }; - return new IndexPatternsService(callDataCluster); + return new IndexPatternsFetcher(callDataCluster); }, }; diff --git a/src/legacy/core_plugins/vis_type_vega/public/vega_request_handler.ts b/src/legacy/core_plugins/vis_type_vega/public/vega_request_handler.ts index 22a71bd999d54..b4c32f37eb90c 100644 --- a/src/legacy/core_plugins/vis_type_vega/public/vega_request_handler.ts +++ b/src/legacy/core_plugins/vis_type_vega/public/vega_request_handler.ts @@ -16,13 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -import { Filter } from '@kbn/es-query'; + import { timefilter } from 'ui/timefilter'; import { TimeRange } from 'src/plugins/data/public'; import { Query } from 'src/legacy/core_plugins/data/public'; - -// @ts-ignore import { buildEsQuery, getEsQueryConfig } from '@kbn/es-query'; + +import { esFilters } from '../../../../plugins/data/public'; + // @ts-ignore import { VegaParser } from './data_model/vega_parser'; // @ts-ignore @@ -35,7 +36,7 @@ import { VisParams } from './vega_fn'; interface VegaRequestHandlerParams { query: Query; - filters: Filter; + filters: esFilters.Filter; timeRange: TimeRange; visParams: VisParams; } diff --git a/src/legacy/core_plugins/vis_type_vega/public/vega_view/vega_base_view.js b/src/legacy/core_plugins/vis_type_vega/public/vega_view/vega_base_view.js index ec898080c581e..5abb99e9bf716 100644 --- a/src/legacy/core_plugins/vis_type_vega/public/vega_view/vega_base_view.js +++ b/src/legacy/core_plugins/vis_type_vega/public/vega_view/vega_base_view.js @@ -27,7 +27,7 @@ import { Utils } from '../data_model/utils'; import { VISUALIZATION_COLORS } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { TooltipHandler } from './vega_tooltip'; -import { buildQueryFilter } from '@kbn/es-query'; +import { esFilters } from '../../../../../plugins/data/public'; import { getEnableExternalUrls } from '../helpers/vega_config_provider'; @@ -263,7 +263,7 @@ export class VegaBaseView { */ async addFilterHandler(query, index) { const indexId = await this._findIndex(index); - const filter = buildQueryFilter(query, indexId); + const filter = esFilters.buildQueryFilter(query, indexId); this._queryfilter.addFilters(filter); } @@ -274,7 +274,7 @@ export class VegaBaseView { async removeFilterHandler(query, index) { const $injector = await chrome.dangerouslyGetActiveInjector(); const indexId = await this._findIndex(index); - const filter = buildQueryFilter(query, indexId); + const filter = esFilters.buildQueryFilter(query, indexId); // This is a workaround for the https://github.com/elastic/kibana/issues/18863 // Once fixed, replace with a direct call (no await is needed because its not async) diff --git a/src/legacy/core_plugins/vis_type_vega/public/vega_visualization.js b/src/legacy/core_plugins/vis_type_vega/public/vega_visualization.js index 1dc73d6f9ff20..7aa60bb0cc469 100644 --- a/src/legacy/core_plugins/vis_type_vega/public/vega_visualization.js +++ b/src/legacy/core_plugins/vis_type_vega/public/vega_visualization.js @@ -23,6 +23,7 @@ import { VegaView } from './vega_view/vega_view'; import { VegaMapView } from './vega_view/vega_map_view'; import { timefilter } from 'ui/timefilter'; import { start as data } from '../../../core_plugins/data/public/legacy'; +import { npStart } from 'ui/new_platform'; import { findIndexPatternByTitle } from '../../data/public/index_patterns'; @@ -99,11 +100,12 @@ export const createVegaVisualization = ({ serviceSettings }) => class VegaVisual this._vegaView = null; } + const { filterManager } = npStart.plugins.data.query; const vegaViewParams = { parentEl: this._el, vegaParser, serviceSettings, - queryfilter: data.filter.filterManager, + queryfilter: filterManager, timefilter: timefilter, findIndex: this.findIndex.bind(this), }; diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts index 5dc0e452eea56..5d7ab12a677cf 100644 --- a/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts +++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts @@ -42,6 +42,7 @@ const createSetupContract = (): VisualizationsSetup => ({ types: { registerVisualization: jest.fn(), registerAlias: jest.fn(), + hideTypes: jest.fn(), }, }); diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/types/types_service.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/types/types_service.ts index 1556c3716de1a..e0d26e3405048 100644 --- a/src/legacy/core_plugins/visualizations/public/np_ready/public/types/types_service.ts +++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/types/types_service.ts @@ -48,16 +48,30 @@ export interface VisType { */ export class TypesService { private types: Record = {}; + private unregisteredHiddenTypes: string[] = []; public setup() { return { registerVisualization: (registerFn: () => VisType) => { const visDefinition = registerFn(); + if (this.unregisteredHiddenTypes.includes(visDefinition.name)) { + visDefinition.hidden = true; + } + if (this.types[visDefinition.name]) { throw new Error('type already exists!'); } this.types[visDefinition.name] = visDefinition; }, registerAlias: visTypeAliasRegistry.add, + hideTypes: (typeNames: string[]) => { + typeNames.forEach((name: string) => { + if (this.types[name]) { + this.types[name].hidden = true; + } else { + this.unregisteredHiddenTypes.push(name); + } + }); + }, }; } diff --git a/src/legacy/server/index_patterns/index.ts b/src/legacy/server/index_patterns/index.ts index eea8a4a998e2d..75d0038cf9023 100644 --- a/src/legacy/server/index_patterns/index.ts +++ b/src/legacy/server/index_patterns/index.ts @@ -17,7 +17,9 @@ * under the License. */ -// @ts-ignore no types export { indexPatternsMixin } from './mixin'; -export { IndexPatternsService, FieldDescriptor } from './service'; +export { + IndexPatternsFetcher, + FieldDescriptor, +} from '../../../plugins/data/server/index_patterns/fetcher'; export { IndexPatternsServiceFactory } from './mixin'; diff --git a/src/legacy/server/index_patterns/mixin.ts b/src/legacy/server/index_patterns/mixin.ts index a7180d6a2d70e..6b04c3842007b 100644 --- a/src/legacy/server/index_patterns/mixin.ts +++ b/src/legacy/server/index_patterns/mixin.ts @@ -17,11 +17,10 @@ * under the License. */ -import { IndexPatternsService } from './service'; +import { IndexPatternsFetcher } from '../../../plugins/data/server'; import KbnServer from '../kbn_server'; import { APICaller, CallAPIOptions } from '../../../core/server'; import { Legacy } from '../../../../kibana'; -import { registerRoutes } from './routes'; export function indexPatternsMixin(kbnServer: KbnServer, server: Legacy.Server) { /** @@ -31,7 +30,7 @@ export function indexPatternsMixin(kbnServer: KbnServer, server: Legacy.Server) * @type {IndexPatternsService} */ server.decorate('server', 'indexPatternsServiceFactory', ({ callCluster }) => { - return new IndexPatternsService(callCluster); + return new IndexPatternsFetcher(callCluster); }); /** @@ -50,10 +49,8 @@ export function indexPatternsMixin(kbnServer: KbnServer, server: Legacy.Server) ) => callWithRequest(request, endpoint, params, options); return server.indexPatternsServiceFactory({ callCluster }); }); - - registerRoutes(kbnServer.newPlatform.setup.core); } export type IndexPatternsServiceFactory = (args: { callCluster: (endpoint: string, clientParams: any, options: any) => Promise; -}) => IndexPatternsService; +}) => IndexPatternsFetcher; diff --git a/src/legacy/server/kbn_server.d.ts b/src/legacy/server/kbn_server.d.ts index e7f2f4c85435f..9cc4e30d4252d 100644 --- a/src/legacy/server/kbn_server.d.ts +++ b/src/legacy/server/kbn_server.d.ts @@ -150,5 +150,5 @@ export default class KbnServer { export { Server, Request, ResponseToolkit } from 'hapi'; // Re-export commonly accessed api types. -export { IndexPatternsService } from './index_patterns'; +export { IndexPatternsFetcher as IndexPatternsService } from './index_patterns'; export { SavedObjectsLegacyService, SavedObjectsClient } from 'src/core/server'; diff --git a/src/legacy/server/sample_data/data_sets/ecommerce/saved_objects.js b/src/legacy/server/sample_data/data_sets/ecommerce/saved_objects.js index 87a1f1c9ece47..da44cc618eedd 100644 --- a/src/legacy/server/sample_data/data_sets/ecommerce/saved_objects.js +++ b/src/legacy/server/sample_data/data_sets/ecommerce/saved_objects.js @@ -269,7 +269,7 @@ export const getSavedObjects = () => [ "attributes": { "title": "kibana_sample_data_ecommerce", "timeFieldName": "order_date", - "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"esTypes\":[\"_id\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"esTypes\":[\"_index\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"esTypes\":[\"_source\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"esTypes\":[\"_type\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"category\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"category.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"category\",\"subType\":\"multi\"},{\"name\":\"currency\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"customer_birth_date\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"customer_first_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_first_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"customer_first_name\",\"subType\":\"multi\"},{\"name\":\"customer_full_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_full_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"customer_full_name\",\"subType\":\"multi\"},{\"name\":\"customer_gender\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"customer_id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"customer_last_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_last_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"customer_last_name\",\"subType\":\"multi\"},{\"name\":\"customer_phone\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"day_of_week\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"day_of_week_i\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"email\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.city_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.continent_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.location\",\"type\":\"geo_point\",\"esTypes\":[\"geo_point\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.region_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"manufacturer\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"manufacturer.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"manufacturer\",\"subType\":\"multi\"},{\"name\":\"order_date\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"order_id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products._id\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"products._id.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"products._id\",\"subType\":\"multi\"},{\"name\":\"products.base_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.base_unit_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.category\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"products.category.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"products.category\",\"subType\":\"multi\"},{\"name\":\"products.created_on\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.discount_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.discount_percentage\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.manufacturer\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"products.manufacturer.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"products.manufacturer\",\"subType\":\"multi\"},{\"name\":\"products.min_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.product_id\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.product_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"products.product_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"products.product_name\",\"subType\":\"multi\"},{\"name\":\"products.quantity\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.sku\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.tax_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.taxful_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.taxless_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.unit_discount_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sku\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"taxful_total_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"taxless_total_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"total_quantity\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"total_unique_products\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"type\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]", + "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"esTypes\":[\"_id\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"esTypes\":[\"_index\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"esTypes\":[\"_source\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"esTypes\":[\"_type\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"category\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"category.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"category\"}}},{\"name\":\"currency\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"customer_birth_date\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"customer_first_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_first_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"customer_first_name\"}}},{\"name\":\"customer_full_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_full_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"customer_full_name\"}}},{\"name\":\"customer_gender\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"customer_id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"customer_last_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_last_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"customer_last_name\"}}},{\"name\":\"customer_phone\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"day_of_week\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"day_of_week_i\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"email\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.city_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.continent_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.location\",\"type\":\"geo_point\",\"esTypes\":[\"geo_point\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.region_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"manufacturer\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"manufacturer.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"manufacturer\"}}},{\"name\":\"order_date\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"order_id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products._id\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"products._id.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"products._id\"}}},{\"name\":\"products.base_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.base_unit_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.category\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"products.category.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"products.category\"}}},{\"name\":\"products.created_on\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.discount_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.discount_percentage\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.manufacturer\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"products.manufacturer.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"products.manufacturer\"}}},{\"name\":\"products.min_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.product_id\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.product_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"products.product_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"products.product_name\"}}},{\"name\":\"products.quantity\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.sku\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.tax_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.taxful_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.taxless_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.unit_discount_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sku\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"taxful_total_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"taxless_total_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"total_quantity\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"total_unique_products\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"type\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]", "fieldFormatMap": "{\"taxful_total_price\":{\"id\":\"number\",\"params\":{\"pattern\":\"$0,0.[00]\"}}}" } }, diff --git a/src/legacy/server/sample_data/data_sets/logs/saved_objects.js b/src/legacy/server/sample_data/data_sets/logs/saved_objects.js index 234436349b02f..522f43d107b24 100644 --- a/src/legacy/server/sample_data/data_sets/logs/saved_objects.js +++ b/src/legacy/server/sample_data/data_sets/logs/saved_objects.js @@ -241,7 +241,7 @@ export const getSavedObjects = () => [ "attributes": { "title": "kibana_sample_data_logs", "timeFieldName": "timestamp", - "fields": "[{\"name\":\"@timestamp\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"esTypes\":[\"_id\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"esTypes\":[\"_index\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"esTypes\":[\"_source\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"esTypes\":[\"_type\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"agent\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"agent.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"agent\",\"subType\":\"multi\"},{\"name\":\"bytes\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.dataset\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"extension\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"extension.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"extension\",\"subType\":\"multi\"},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"esTypes\":[\"geo_point\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"host.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"host\",\"subType\":\"multi\"},{\"name\":\"index\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"index.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"index\",\"subType\":\"multi\"},{\"name\":\"ip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"machine.os.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"machine.os\",\"subType\":\"multi\"},{\"name\":\"machine.ram\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"memory\",\"type\":\"number\",\"esTypes\":[\"double\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"message\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"message.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"message\",\"subType\":\"multi\"},{\"name\":\"phpmemory\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"referer\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"request\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"request.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"request\",\"subType\":\"multi\"},{\"name\":\"response\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"response.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"response\",\"subType\":\"multi\"},{\"name\":\"tags\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"tags.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"tags\",\"subType\":\"multi\"},{\"name\":\"timestamp\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"url.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"url\",\"subType\":\"multi\"},{\"name\":\"utc_time\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"hour_of_day\",\"type\":\"number\",\"count\":0,\"scripted\":true,\"script\":\"doc['timestamp'].value.getHour()\",\"lang\":\"painless\",\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false}]", + "fields": "[{\"name\":\"@timestamp\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"esTypes\":[\"_id\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"esTypes\":[\"_index\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"esTypes\":[\"_source\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"esTypes\":[\"_type\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"agent\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"agent.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"agent\"}}},{\"name\":\"bytes\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.dataset\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"extension\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"extension.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"extension\"}}},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"esTypes\":[\"geo_point\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"host.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"host\"}}},{\"name\":\"index\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"index.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"index\"}}},{\"name\":\"ip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"machine.os.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"machine.os\"}}},{\"name\":\"machine.ram\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"memory\",\"type\":\"number\",\"esTypes\":[\"double\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"message\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"message.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"message\"}}},{\"name\":\"phpmemory\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"referer\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"request\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"request.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"request\"}}},{\"name\":\"response\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"response.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"response\"}}},{\"name\":\"tags\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"tags.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"tags\"}}},{\"name\":\"timestamp\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"url.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"url\"}}},{\"name\":\"utc_time\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"hour_of_day\",\"type\":\"number\",\"count\":0,\"scripted\":true,\"script\":\"doc['timestamp'].value.getHour()\",\"lang\":\"painless\",\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false}]", "fieldFormatMap": "{\"hour_of_day\":{}}" } }, diff --git a/src/legacy/server/usage/README.md b/src/legacy/server/usage/README.md index ad1bb822b70cd..5c4bcc05bbc38 100644 --- a/src/legacy/server/usage/README.md +++ b/src/legacy/server/usage/README.md @@ -90,5 +90,3 @@ There are a few ways you can test that your usage collector is working properly. Yes. When you talk to the Platform team about new fields being added, point out specifically which properties will have dynamic inner fields. 5. **If I accumulate an event counter in server memory, which my fetch method returns, won't it reset when the Kibana server restarts?** Yes, but that is not a major concern. A visualization on such info might be a date histogram that gets events-per-second or something, which would be impacted by server restarts, so we'll have to offset the beginning of the time range when we detect that the latest metric is smaller than the earliest metric. That would be a pretty custom visualization, but perhaps future Kibana enhancements will be able to support that. -6. **Who can I talk to with more questions?** - The Kibana Platform team is the owner of the telemetry service. You can bring questions to them. You can also talk to Tim Sullivan, who created the Kibana telemetry service, or Chris Earle, who set up the telemetry cluster and AWS Lambas for the upstream prod and staging endpoints that recieve the data sent from end-user browsers. diff --git a/src/legacy/ui/public/agg_types/__tests__/agg_param_writer.js b/src/legacy/ui/public/agg_types/__tests__/agg_param_writer.js deleted file mode 100644 index c85899ca5704e..0000000000000 --- a/src/legacy/ui/public/agg_types/__tests__/agg_param_writer.js +++ /dev/null @@ -1,103 +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 { VisProvider } from '../../vis'; -import { aggTypes } from '..'; -import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -import { AggGroupNames } from '../../vis/editors/default/agg_groups'; - -// eslint-disable-next-line import/no-default-export -export default function AggParamWriterHelper(Private) { - const Vis = Private(VisProvider); - const stubbedLogstashIndexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); - - /** - * Helper object for writing aggParams. Specify an aggType and it will find a vis & schema, and - * wire up the supporting objects required to feed in parameters, and get #write() output. - * - * Use cases: - * - Verify that the interval parameter of the histogram visualization casts its input to a number - * ```js - * it('casts to a number', function () { - * let writer = new AggParamWriter({ aggType: 'histogram' }); - * let output = writer.write({ interval : '100/10' }); - * expect(output.params.interval).to.be.a('number'); - * expect(output.params.interval).to.be(100); - * }); - * ``` - * - * @class AggParamWriter - * @param {object} opts - describe the properties of this paramWriter - * @param {string} opts.aggType - the name of the aggType we want to test. ('histogram', 'filter', etc.) - */ - class AggParamWriter { - - constructor(opts) { - this.aggType = opts.aggType; - if (_.isString(this.aggType)) { - this.aggType = aggTypes.buckets.find(agg => agg.name === this.aggType) || aggTypes.metrics.find(agg => agg.name === this.aggType); - } - - // not configurable right now, but totally required - this.indexPattern = stubbedLogstashIndexPattern; - - // the schema that the aggType satisfies - this.visAggSchema = null; - - this.vis = new Vis(this.indexPattern, { - type: 'histogram', - aggs: [{ - id: 1, - type: this.aggType.name, - params: {} - }] - }); - } - - write(paramValues, modifyAggConfig = null) { - paramValues = _.clone(paramValues); - - if (this.aggType.paramByName('field') && !paramValues.field) { - // pick a field rather than force a field to be specified everywhere - if (this.aggType.type === AggGroupNames.Metrics) { - paramValues.field = _.sample(this.indexPattern.fields.getByType('number')); - } else { - const type = this.aggType.paramByName('field').filterFieldTypes || 'string'; - let field; - do { - field = _.sample(this.indexPattern.fields.getByType(type)); - } while (!field.aggregatable); - paramValues.field = field.name; - } - } - - const aggConfig = this.vis.aggs.aggs[0]; - aggConfig.setParams(paramValues); - - if (modifyAggConfig) { - modifyAggConfig(aggConfig); - } - - return aggConfig.write(this.vis.aggs); - } - } - - return AggParamWriter; -} diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/_date_range.js b/src/legacy/ui/public/agg_types/__tests__/buckets/_date_range.js deleted file mode 100644 index 94603dfa69a66..0000000000000 --- a/src/legacy/ui/public/agg_types/__tests__/buckets/_date_range.js +++ /dev/null @@ -1,80 +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 { set } from 'lodash'; -import expect from '@kbn/expect'; -import sinon from 'sinon'; -import ngMock from 'ng_mock'; -import { aggTypes } from '../..'; -import AggParamWriterProvider from '../agg_param_writer'; -import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -import chrome from '../../../chrome'; - -const config = chrome.getUiSettingsClient(); - -describe('date_range params', function () { - let paramWriter; - let timeField; - - beforeEach(ngMock.module('kibana')); - beforeEach(ngMock.inject(function (Private) { - const AggParamWriter = Private(AggParamWriterProvider); - const indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); - - timeField = indexPattern.timeFieldName; - paramWriter = new AggParamWriter({ aggType: 'date_range' }); - })); - - describe('getKey', () => { - const dateRange = aggTypes.buckets.find(agg => agg.name === 'date_range'); - it('should return object', () => { - const bucket = { from: 'from-date', to: 'to-date', key: 'from-dateto-date' }; - expect(dateRange.getKey(bucket)).to.equal({ from: 'from-date', to: 'to-date' }); - }); - }); - - describe('time_zone', () => { - beforeEach(() => { - sinon.stub(config, 'get'); - sinon.stub(config, 'isDefault'); - }); - - it('should use the specified time_zone', () => { - const output = paramWriter.write({ time_zone: 'Europe/Kiev' }); - expect(output.params).to.have.property('time_zone', 'Europe/Kiev'); - }); - - it('should use the Kibana time_zone if no parameter specified', () => { - config.isDefault.withArgs('dateFormat:tz').returns(false); - config.get.withArgs('dateFormat:tz').returns('Europe/Riga'); - const output = paramWriter.write({}); - expect(output.params).to.have.property('time_zone', 'Europe/Riga'); - }); - - it('should use the fixed time_zone from the index pattern typeMeta', () => { - set(paramWriter.indexPattern, ['typeMeta', 'aggs', 'date_range', timeField, 'time_zone'], 'Europe/Rome'); - const output = paramWriter.write({ field: timeField }); - expect(output.params).to.have.property('time_zone', 'Europe/Rome'); - }); - - afterEach(() => { - config.get.restore(); - config.isDefault.restore(); - }); - }); -}); diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/_geo_hash.js b/src/legacy/ui/public/agg_types/__tests__/buckets/_geo_hash.js deleted file mode 100644 index 7172d1f40936e..0000000000000 --- a/src/legacy/ui/public/agg_types/__tests__/buckets/_geo_hash.js +++ /dev/null @@ -1,257 +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 '@kbn/expect'; -import sinon from 'sinon'; -import { geoHashBucketAgg } from '../../buckets/geo_hash'; -import * as AggConfigModule from '../../agg_config'; -import * as BucketAggTypeModule from '../../buckets/_bucket_agg_type'; - -describe('Geohash Agg', () => { - - const initialZoom = 10; - const initialMapBounds = { - top_left: { lat: 1.0, lon: -1.0 }, - bottom_right: { lat: -1.0, lon: 1.0 } - }; - - const BucketAggTypeMock = (aggOptions) => { - return aggOptions; - }; - const AggConfigMock = (parent, aggOptions) => { - return aggOptions; - }; - const createAggregationMock = (aggOptions) => { - return new AggConfigMock(null, aggOptions); - }; - - const aggMock = { - getField: () => { - return { - name: 'location' - }; - }, - params: { - isFilteredByCollar: true, - useGeocentroid: true, - mapZoom: initialZoom - }, - aggConfigs: {}, - type: 'geohash_grid', - }; - aggMock.aggConfigs.createAggConfig = createAggregationMock; - - - before(function () { - sinon.stub(AggConfigModule, 'AggConfig').callsFake(AggConfigMock); - sinon.stub(BucketAggTypeModule, 'BucketAggType').callsFake(BucketAggTypeMock); - }); - - after(function () { - AggConfigModule.AggConfig.restore(); - BucketAggTypeModule.BucketAggType.restore(); - }); - - function initAggParams() { - aggMock.params.isFilteredByCollar = true; - aggMock.params.useGeocentroid = true; - aggMock.params.mapBounds = initialMapBounds; - } - - function zoomMap(zoomChange) { - aggMock.params.mapZoom += zoomChange; - } - - function moveMap(newBounds) { - aggMock.params.mapBounds = newBounds; - } - - function resetMap() { - aggMock.params.mapZoom = initialZoom; - aggMock.params.mapBounds = initialMapBounds; - aggMock.params.mapCollar = { - top_left: { lat: 1.5, lon: -1.5 }, - bottom_right: { lat: -1.5, lon: 1.5 }, - zoom: initialZoom - }; - } - - describe('precision parameter', () => { - - const PRECISION_PARAM_INDEX = 2; - let precisionParam; - beforeEach(() => { - precisionParam = geoHashBucketAgg.params[PRECISION_PARAM_INDEX]; - }); - - it('should select precision parameter', () => { - expect(precisionParam.name).to.equal('precision'); - }); - - describe('precision parameter write', () => { - - const zoomToGeoHashPrecision = { - 0: 1, - 1: 2, - 2: 2, - 3: 2, - 4: 3, - 5: 3, - 6: 4, - 7: 4, - 8: 4, - 9: 5, - 10: 5, - 11: 6, - 12: 6, - 13: 6, - 14: 7, - 15: 7, - 16: 7, - 17: 7, - 18: 7, - 19: 7, - 20: 7, - 21: 7 - }; - - Object.keys(zoomToGeoHashPrecision).forEach((zoomLevel) => { - it(`zoom level ${zoomLevel} should correspond to correct geohash-precision`, () => { - const output = { params: {} }; - precisionParam.write({ - params: { - autoPrecision: true, - mapZoom: zoomLevel - } - }, output); - expect(output.params.precision).to.equal(zoomToGeoHashPrecision[zoomLevel]); - }); - }); - }); - - }); - - describe('getRequestAggs', () => { - - describe('initial aggregation creation', () => { - let requestAggs; - beforeEach(() => { - initAggParams(); - requestAggs = geoHashBucketAgg.getRequestAggs(aggMock); - }); - - it('should create filter, geohash_grid, and geo_centroid aggregations', () => { - expect(requestAggs.length).to.equal(3); - expect(requestAggs[0].type).to.equal('filter'); - expect(requestAggs[1].type).to.equal('geohash_grid'); - expect(requestAggs[2].type).to.equal('geo_centroid'); - }); - - it('should set mapCollar in vis session state', () => { - expect(aggMock).to.have.property('lastMapCollar'); - expect(aggMock.lastMapCollar).to.have.property('top_left'); - expect(aggMock.lastMapCollar).to.have.property('bottom_right'); - expect(aggMock.lastMapCollar).to.have.property('zoom'); - }); - - // there was a bug because of an "&& mapZoom" check which excluded 0 as a valid mapZoom, but it is. - it('should create filter, geohash_grid, and geo_centroid aggregations when zoom level 0', () => { - aggMock.params.mapZoom = 0; - requestAggs = geoHashBucketAgg.getRequestAggs(aggMock); - expect(requestAggs.length).to.equal(3); - expect(requestAggs[0].type).to.equal('filter'); - expect(requestAggs[1].type).to.equal('geohash_grid'); - expect(requestAggs[2].type).to.equal('geo_centroid'); - }); - }); - - describe('aggregation options', () => { - - beforeEach(() => { - initAggParams(); - }); - - it('should only create geohash_grid and geo_centroid aggregations when isFilteredByCollar is false', () => { - aggMock.params.isFilteredByCollar = false; - const requestAggs = geoHashBucketAgg.getRequestAggs(aggMock); - expect(requestAggs.length).to.equal(2); - expect(requestAggs[0].type).to.equal('geohash_grid'); - expect(requestAggs[1].type).to.equal('geo_centroid'); - }); - - it('should only create filter and geohash_grid aggregations when useGeocentroid is false', () => { - aggMock.params.useGeocentroid = false; - const requestAggs = geoHashBucketAgg.getRequestAggs(aggMock); - expect(requestAggs.length).to.equal(2); - expect(requestAggs[0].type).to.equal('filter'); - expect(requestAggs[1].type).to.equal('geohash_grid'); - - }); - }); - - describe('aggregation creation after map interaction', () => { - - let origRequestAggs; - let origMapCollar; - beforeEach(() => { - resetMap(); - initAggParams(); - origRequestAggs = geoHashBucketAgg.getRequestAggs(aggMock); - origMapCollar = JSON.stringify(aggMock.lastMapCollar, null, ''); - }); - - it('should not change geo_bounding_box filter aggregation and vis session state when map movement is within map collar', () => { - moveMap({ - top_left: { lat: 1.1, lon: -1.1 }, - bottom_right: { lat: -0.9, lon: 0.9 } - }); - - const newRequestAggs = geoHashBucketAgg.getRequestAggs(aggMock); - expect(JSON.stringify(origRequestAggs[0].params, null, '')).to.equal(JSON.stringify(newRequestAggs[0].params, null, '')); - - const newMapCollar = JSON.stringify(aggMock.lastMapCollar, null, ''); - expect(origMapCollar).to.equal(newMapCollar); - }); - - it('should change geo_bounding_box filter aggregation and vis session state when map movement is outside map collar', () => { - moveMap({ - top_left: { lat: 10.0, lon: -10.0 }, - bottom_right: { lat: 9.0, lon: -9.0 } - }); - - const newRequestAggs = geoHashBucketAgg.getRequestAggs(aggMock); - expect(JSON.stringify(origRequestAggs[0].params, null, '')).not.to.equal(JSON.stringify(newRequestAggs[0].params, null, '')); - - const newMapCollar = JSON.stringify(aggMock.lastMapCollar, null, ''); - expect(origMapCollar).not.to.equal(newMapCollar); - }); - - it('should change geo_bounding_box filter aggregation and vis session state when map zoom level changes', () => { - zoomMap(-1); - - geoHashBucketAgg.getRequestAggs(aggMock); - - const newMapCollar = JSON.stringify(aggMock.lastMapCollar, null, ''); - expect(origMapCollar).not.to.equal(newMapCollar); - }); - - }); - - }); -}); diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/_histogram.js b/src/legacy/ui/public/agg_types/__tests__/buckets/_histogram.js deleted file mode 100644 index 26ad80e28ae9b..0000000000000 --- a/src/legacy/ui/public/agg_types/__tests__/buckets/_histogram.js +++ /dev/null @@ -1,210 +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 '@kbn/expect'; -import sinon from 'sinon'; -import ngMock from 'ng_mock'; -import { aggTypes } from '../..'; -import chrome from '../../../chrome'; -import AggParamWriterProvider from '../agg_param_writer'; - -const config = chrome.getUiSettingsClient(); -const histogram = aggTypes.buckets.find(agg => agg.name === 'histogram'); -describe('Histogram Agg', function () { - - describe('ordered', function () { - - it('is ordered', function () { - expect(histogram.ordered).to.be.ok(); - }); - - it('is not ordered by date', function () { - expect(histogram.ordered).to.not.have.property('date'); - }); - }); - - - describe('params', function () { - let paramWriter; - - beforeEach(ngMock.module('kibana')); - beforeEach(ngMock.inject(function (Private) { - const AggParamWriter = Private(AggParamWriterProvider); - paramWriter = new AggParamWriter({ aggType: 'histogram' }); - })); - - describe('intervalBase', () => { - it('should not be written to the DSL', () => { - const output = paramWriter.write({ intervalBase: 100 }); - expect(output.params).not.to.have.property('intervalBase'); - }); - }); - - describe('interval', function () { - // reads aggConfig.params.interval, writes to dsl.interval - - it('accepts a whole number', function () { - const output = paramWriter.write({ interval: 100 }); - expect(output.params).to.have.property('interval', 100); - }); - - it('accepts a decimal number', function () { - const output = paramWriter.write({ interval: 0.1 }); - expect(output.params).to.have.property('interval', 0.1); - }); - - it('accepts a decimal number string', function () { - const output = paramWriter.write({ interval: '0.1' }); - expect(output.params).to.have.property('interval', 0.1); - }); - - it('accepts a whole number string', function () { - const output = paramWriter.write({ interval: '10' }); - expect(output.params).to.have.property('interval', 10); - }); - - it('fails on non-numeric values', function () { - // template validation prevents this from users, not devs - const output = paramWriter.write({ interval: [] }); - expect(isNaN(output.params.interval)).to.be.ok(); - }); - - describe('interval scaling', () => { - - beforeEach(() => { - sinon.stub(config, 'get'); - }); - - it('will respect the histogram:maxBars setting', () => { - config.get.withArgs('histogram:maxBars').returns(5); - const output = paramWriter.write({ interval: 5 }, - aggConfig => aggConfig.setAutoBounds({ min: 0, max: 10000 })); - expect(output.params).to.have.property('interval', 2000); - }); - - it('will return specified interval, if bars are below histogram:maxBars config', () => { - config.get.withArgs('histogram:maxBars').returns(10000); - const output = paramWriter.write({ interval: 5 }, - aggConfig => aggConfig.setAutoBounds({ min: 0, max: 10000 })); - expect(output.params).to.have.property('interval', 5); - }); - - it('will set to intervalBase if interval is below base', () => { - const output = paramWriter.write({ interval: 3, intervalBase: 8 }); - expect(output.params).to.have.property('interval', 8); - }); - - it('will round to nearest intervalBase multiple if interval is above base', () => { - const roundUp = paramWriter.write({ interval: 46, intervalBase: 10 }); - expect(roundUp.params).to.have.property('interval', 50); - const roundDown = paramWriter.write({ interval: 43, intervalBase: 10 }); - expect(roundDown.params).to.have.property('interval', 40); - }); - - it('will not change interval if it is a multiple of base', () => { - const output = paramWriter.write({ interval: 35, intervalBase: 5 }); - expect(output.params).to.have.property('interval', 35); - }); - - it('will round to intervalBase after scaling histogram:maxBars', () => { - config.get.withArgs('histogram:maxBars').returns(100); - const output = paramWriter.write({ interval: 5, intervalBase: 6 }, - aggConfig => aggConfig.setAutoBounds({ min: 0, max: 1000 })); - // 100 buckets in 0 to 1000 would result in an interval of 10, so we should - // round to the next multiple of 6 -> 12 - expect(output.params).to.have.property('interval', 12); - }); - - afterEach(() => { - config.get.restore(); - }); - }); - }); - - describe('min_doc_count', function () { - it('casts true values to 0', function () { - let output = paramWriter.write({ min_doc_count: true }); - expect(output.params).to.have.property('min_doc_count', 0); - - output = paramWriter.write({ min_doc_count: 'yes' }); - expect(output.params).to.have.property('min_doc_count', 0); - - output = paramWriter.write({ min_doc_count: 1 }); - expect(output.params).to.have.property('min_doc_count', 0); - - output = paramWriter.write({ min_doc_count: {} }); - expect(output.params).to.have.property('min_doc_count', 0); - }); - - it('writes 1 for falsy values', function () { - let output = paramWriter.write({ min_doc_count: '' }); - expect(output.params).to.have.property('min_doc_count', 1); - - output = paramWriter.write({ min_doc_count: null }); - expect(output.params).to.have.property('min_doc_count', 1); - - output = paramWriter.write({ min_doc_count: undefined }); - expect(output.params).to.have.property('min_doc_count', 1); - }); - }); - - describe('extended_bounds', function () { - it('does not write when only eb.min is set', function () { - const output = paramWriter.write({ - has_extended_bounds: true, - extended_bounds: { min: 0 } - }); - expect(output.params).not.to.have.property('extended_bounds'); - }); - - it('does not write when only eb.max is set', function () { - const output = paramWriter.write({ - has_extended_bounds: true, - extended_bounds: { max: 0 } - }); - expect(output.params).not.to.have.property('extended_bounds'); - }); - - it('writes when both eb.min and eb.max are set', function () { - const output = paramWriter.write({ - has_extended_bounds: true, - extended_bounds: { min: 99, max: 100 } - }); - expect(output.params.extended_bounds).to.have.property('min', 99); - expect(output.params.extended_bounds).to.have.property('max', 100); - }); - - it('does not write when nothing is set', function () { - const output = paramWriter.write({ - has_extended_bounds: true, - extended_bounds: {} - }); - expect(output.params).to.not.have.property('extended_bounds'); - }); - - it('does not write when has_extended_bounds is false', function () { - const output = paramWriter.write({ - has_extended_bounds: false, - extended_bounds: { min: 99, max: 100 } - }); - expect(output.params).to.not.have.property('extended_bounds'); - }); - }); - }); -}); diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/_range.js b/src/legacy/ui/public/agg_types/__tests__/buckets/_range.js deleted file mode 100644 index e47802aa6f4bf..0000000000000 --- a/src/legacy/ui/public/agg_types/__tests__/buckets/_range.js +++ /dev/null @@ -1,71 +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 { values } from 'lodash'; -import ngMock from 'ng_mock'; -import expect from '@kbn/expect'; -import resp from 'fixtures/agg_resp/range'; -import { VisProvider } from '../../../vis'; -import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; - -describe('Range Agg', function () { - const buckets = values(resp.aggregations[1].buckets); - - let Vis; - let indexPattern; - - beforeEach(ngMock.module('kibana')); - beforeEach(ngMock.inject(function (Private) { - Vis = Private(VisProvider); - indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); - indexPattern.stubSetFieldFormat('bytes', 'bytes', { - pattern: '0,0.[000] b' - }); - })); - - describe('formating', function () { - it('formats bucket keys properly', function () { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ - { - type: 'range', - schema: 'segment', - params: { - field: 'bytes', - ranges: [ - { from: 0, to: 1000 }, - { from: 1000, to: 2000 } - ] - } - } - ] - }); - - const agg = vis.aggs.byName('range')[0]; - const format = function (val) { - return agg.fieldFormatter()(agg.getKey(val)); - }; - expect(format(buckets[0])).to.be('≥ -∞ and < 1 KB'); - expect(format(buckets[1])).to.be('≥ 1 KB and < 2.5 KB'); - expect(format(buckets[2])).to.be('≥ 2.5 KB and < +∞'); - - }); - }); -}); diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js b/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js deleted file mode 100644 index 11e410c43b592..0000000000000 --- a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.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. - */ - -import _ from 'lodash'; -import moment from 'moment'; -import aggResp from 'fixtures/agg_resp/date_histogram'; -import ngMock from 'ng_mock'; -import expect from '@kbn/expect'; -import { VisProvider } from '../../../../vis'; -import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -import { createFilterDateHistogram } from '../../../buckets/create_filter/date_histogram'; -import { intervalOptions } from '../../../buckets/_interval_options'; - -describe('AggConfig Filters', function () { - describe('date_histogram', function () { - let vis; - let agg; - let field; - let filter; - let bucketKey; - let bucketStart; - - let init; - - beforeEach(ngMock.module('kibana')); - beforeEach(ngMock.inject(function (Private) { - const Vis = Private(VisProvider); - const indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); - - init = function (interval, duration) { - interval = interval || 'auto'; - if (interval === 'custom') interval = agg.params.customInterval; - duration = duration || moment.duration(15, 'minutes'); - field = _.sample(_.reject(indexPattern.fields.getByType('date'), 'scripted')); - vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ - { - type: 'date_histogram', - schema: 'segment', - params: { field: field.name, interval: interval, customInterval: '5d' } - } - ] - }); - - agg = vis.aggs.aggs[0]; - bucketKey = _.sample(aggResp.aggregations['1'].buckets).key; - bucketStart = moment(bucketKey); - - const timePad = moment.duration(duration / 2); - agg.buckets.setBounds({ - min: bucketStart.clone().subtract(timePad), - max: bucketStart.clone().add(timePad), - }); - agg.buckets.setInterval(interval); - - filter = createFilterDateHistogram(agg, bucketKey); - }; - })); - - it('creates a valid range filter', function () { - init(); - - expect(filter).to.have.property('range'); - expect(filter.range).to.have.property(field.name); - - const fieldParams = filter.range[field.name]; - expect(fieldParams).to.have.property('gte'); - expect(fieldParams.gte).to.be.a('string'); - - expect(fieldParams).to.have.property('lt'); - expect(fieldParams.lt).to.be.a('string'); - - expect(fieldParams).to.have.property('format'); - expect(fieldParams.format).to.be('strict_date_optional_time'); - - expect(fieldParams.gte).to.be.lessThan(fieldParams.lt); - - expect(filter).to.have.property('meta'); - expect(filter.meta).to.have.property('index', vis.indexPattern.id); - }); - - - it('extends the filter edge to 1ms before the next bucket for all interval options', function () { - intervalOptions.forEach(function (option) { - let duration; - if (option.val !== 'custom' && moment(1, option.val).isValid()) { - duration = moment.duration(10, option.val); - - if (+duration < 10) { - throw new Error('unable to create interval for ' + option.val); - } - } - - init(option.val, duration); - - const interval = agg.buckets.getInterval(); - const params = filter.range[field.name]; - - expect(params.gte).to.be(bucketStart.toISOString()); - expect(params.lt).to.be(bucketStart.clone().add(interval).toISOString()); - }); - }); - }); -}); diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js b/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js deleted file mode 100644 index 3ba03f232428f..0000000000000 --- a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js +++ /dev/null @@ -1,67 +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 '@kbn/expect'; -import ngMock from 'ng_mock'; -import moment from 'moment'; -import { VisProvider } from '../../../../vis'; -import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -import { createFilterDateRange } from '../../../buckets/create_filter/date_range'; - -describe('AggConfig Filters', function () { - describe('Date range', function () { - let indexPattern; - let Vis; - - beforeEach(ngMock.module('kibana')); - beforeEach(ngMock.inject(function (Private) { - Vis = Private(VisProvider); - indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); - })); - - it('should return a range filter for date_range agg', function () { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ - { - type: 'date_range', - params: { - field: '@timestamp', - ranges: [ - { from: '2014-01-01', to: '2014-12-31' } - ] - } - } - ] - }); - - const aggConfig = vis.aggs.byName('date_range')[0]; - const from = new Date('1 Feb 2015'); - const to = new Date('7 Feb 2015'); - const filter = createFilterDateRange(aggConfig, { from: from.valueOf(), to: to.valueOf() }); - expect(filter).to.have.property('range'); - expect(filter).to.have.property('meta'); - expect(filter.meta).to.have.property('index', indexPattern.id); - expect(filter.range).to.have.property('@timestamp'); - expect(filter.range['@timestamp']).to.have.property('gte', moment(from).toISOString()); - expect(filter.range['@timestamp']).to.have.property('lt', moment(to).toISOString()); - }); - }); -}); diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/filters.js b/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/filters.js deleted file mode 100644 index 409c9a40b19c4..0000000000000 --- a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/filters.js +++ /dev/null @@ -1,61 +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 '@kbn/expect'; -import ngMock from 'ng_mock'; -import { VisProvider } from '../../../../vis'; -import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -import { createFilterFilters } from '../../../buckets/create_filter/filters'; - -describe('AggConfig Filters', function () { - describe('filters', function () { - let indexPattern; - let Vis; - - beforeEach(ngMock.module('kibana')); - beforeEach(ngMock.inject(function (Private) { - Vis = Private(VisProvider); - indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); - })); - - it('should return a filters filter', function () { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ - { - type: 'filters', - schema: 'segment', - params: { - filters: [ - { input: { query: 'type:apache', language: 'lucene' } }, - { input: { query: 'type:nginx', language: 'lucene' } } - ] - } - } - ] - }); - - const aggConfig = vis.aggs.byName('filters')[0]; - const filter = createFilterFilters(aggConfig, 'type:nginx'); - expect(filter.query.bool.must[0].query_string.query).to.be('type:nginx'); - expect(filter.meta).to.have.property('index', indexPattern.id); - expect(filter.meta).to.have.property('alias', 'type:nginx'); - }); - }); -}); diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js b/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js deleted file mode 100644 index 6d4534bba4dd1..0000000000000 --- a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js +++ /dev/null @@ -1,61 +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 '@kbn/expect'; -import ngMock from 'ng_mock'; -import { VisProvider } from '../../../../vis'; -import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -import { createFilterHistogram } from '../../../buckets/create_filter/histogram'; - -describe('AggConfig Filters', function () { - describe('histogram', function () { - let indexPattern; - let Vis; - - beforeEach(ngMock.module('kibana')); - beforeEach(ngMock.inject(function (Private) { - Vis = Private(VisProvider); - indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); - })); - - it('should return an range filter for histogram', function () { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ - { - type: 'histogram', - schema: 'segment', - params: { field: 'bytes', interval: 1024 } - } - ] - }); - - const aggConfig = vis.aggs.byName('histogram')[0]; - const filter = createFilterHistogram(aggConfig, 2048); - expect(filter).to.have.property('meta'); - expect(filter.meta).to.have.property('index', indexPattern.id); - expect(filter).to.have.property('range'); - expect(filter.range).to.have.property('bytes'); - expect(filter.range.bytes).to.have.property('gte', 2048); - expect(filter.range.bytes).to.have.property('lt', 3072); - expect(filter.meta).to.have.property('formattedValue', '2,048'); - }); - }); -}); diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js b/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js deleted file mode 100644 index e29ebd689db20..0000000000000 --- a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js +++ /dev/null @@ -1,97 +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 '@kbn/expect'; -import ngMock from 'ng_mock'; -import { VisProvider } from '../../../../vis'; -import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -import { createFilterIpRange } from '../../../buckets/create_filter/ip_range'; -describe('AggConfig Filters', function () { - - describe('IP range', function () { - let indexPattern; - let Vis; - - beforeEach(ngMock.module('kibana')); - beforeEach(ngMock.inject(function (Private) { - Vis = Private(VisProvider); - indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); - })); - - it('should return a range filter for ip_range agg', function () { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ - { - type: 'ip_range', - schema: 'segment', - params: { - field: 'ip', - ipRangeType: 'fromTo', - ranges: { - fromTo: [ - { from: '0.0.0.0', to: '1.1.1.1' } - ] - } - } - } - ] - }); - - const aggConfig = vis.aggs.byName('ip_range')[0]; - const filter = createFilterIpRange(aggConfig, { type: 'fromTo', from: '0.0.0.0', to: '1.1.1.1' }); - expect(filter).to.have.property('range'); - expect(filter).to.have.property('meta'); - expect(filter.meta).to.have.property('index', indexPattern.id); - expect(filter.range).to.have.property('ip'); - expect(filter.range.ip).to.have.property('gte', '0.0.0.0'); - expect(filter.range.ip).to.have.property('lte', '1.1.1.1'); - }); - - it('should return a range filter for ip_range agg using a CIDR mask', function () { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ - { - type: 'ip_range', - schema: 'segment', - params: { - field: 'ip', - ipRangeType: 'mask', - ranges: { - mask: [ - { mask: '67.129.65.201/27' } - ] - } - } - } - ] - }); - - const aggConfig = vis.aggs.byName('ip_range')[0]; - const filter = createFilterIpRange(aggConfig, { type: 'mask', mask: '67.129.65.201/27' }); - expect(filter).to.have.property('range'); - expect(filter).to.have.property('meta'); - expect(filter.meta).to.have.property('index', indexPattern.id); - expect(filter.range).to.have.property('ip'); - expect(filter.range.ip).to.have.property('gte', '67.129.65.192'); - expect(filter.range.ip).to.have.property('lte', '67.129.65.223'); - }); - }); -}); diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/range.js b/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/range.js deleted file mode 100644 index 228fd6bce5cfb..0000000000000 --- a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/range.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. - */ - -import expect from '@kbn/expect'; -import ngMock from 'ng_mock'; -import { VisProvider } from '../../../../vis'; -import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -import { createFilterRange } from '../../../buckets/create_filter/range'; - -describe('AggConfig Filters', function () { - - describe('range', function () { - let indexPattern; - let Vis; - - beforeEach(ngMock.module('kibana')); - beforeEach(ngMock.inject(function (Private) { - Vis = Private(VisProvider); - indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); - })); - - it('should return a range filter for range agg', function () { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ - { - type: 'range', - schema: 'segment', - params: { - field: 'bytes', - ranges: [ - { from: 1024, to: 2048 } - ] - } - } - ] - }); - - const aggConfig = vis.aggs.byName('range')[0]; - const filter = createFilterRange(aggConfig, { gte: 1024, lt: 2048.0 }); - expect(filter).to.have.property('range'); - expect(filter).to.have.property('meta'); - expect(filter.meta).to.have.property('index', indexPattern.id); - expect(filter.range).to.have.property('bytes'); - expect(filter.range.bytes).to.have.property('gte', 1024.0); - expect(filter.range.bytes).to.have.property('lt', 2048.0); - expect(filter.meta).to.have.property('formattedValue', '≥ 1,024 and < 2,048'); - }); - }); -}); diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/terms.js b/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/terms.js deleted file mode 100644 index a2812ffb97965..0000000000000 --- a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/terms.js +++ /dev/null @@ -1,104 +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 '@kbn/expect'; -import ngMock from 'ng_mock'; -import { VisProvider } from '../../../../vis'; -import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -import { createFilterTerms } from '../../../buckets/create_filter/terms'; - -describe('AggConfig Filters', function () { - - describe('terms', function () { - let indexPattern; - let Vis; - - beforeEach(ngMock.module('kibana')); - beforeEach(ngMock.inject(function (Private) { - Vis = Private(VisProvider); - indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); - })); - - it('should return a match_phrase filter for terms', function () { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ { type: 'terms', schema: 'segment', params: { field: '_type' } } ] - }); - const aggConfig = vis.aggs.byName('terms')[0]; - const filter = createFilterTerms(aggConfig, 'apache'); - expect(filter).to.have.property('query'); - expect(filter.query).to.have.property('match_phrase'); - expect(filter.query.match_phrase).to.have.property('_type'); - expect(filter.query.match_phrase._type).to.be('apache'); - expect(filter).to.have.property('meta'); - expect(filter.meta).to.have.property('index', indexPattern.id); - - }); - - it('should set query to true or false for boolean filter', () => { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ { type: 'terms', schema: 'segment', params: { field: 'ssl' } } ] - }); - const aggConfig = vis.aggs.byName('terms')[0]; - const filterFalse = createFilterTerms(aggConfig, 0); - expect(filterFalse).to.have.property('query'); - expect(filterFalse.query).to.have.property('match_phrase'); - expect(filterFalse.query.match_phrase).to.have.property('ssl'); - expect(filterFalse.query.match_phrase.ssl).to.be(false); - - const filterTrue = createFilterTerms(aggConfig, 1); - expect(filterTrue).to.have.property('query'); - expect(filterTrue.query).to.have.property('match_phrase'); - expect(filterTrue.query.match_phrase).to.have.property('ssl'); - expect(filterTrue.query.match_phrase.ssl).to.be(true); - }); - - it('should generate correct __missing__ filter', () => { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ { type: 'terms', schema: 'segment', params: { field: '_type' } } ] - }); - const aggConfig = vis.aggs.byName('terms')[0]; - const filter = createFilterTerms(aggConfig, '__missing__'); - expect(filter).to.have.property('exists'); - expect(filter.exists).to.have.property('field', '_type'); - expect(filter).to.have.property('meta'); - expect(filter.meta).to.have.property('index', indexPattern.id); - expect(filter.meta).to.have.property('negate', true); - }); - - it('should generate correct __other__ filter', () => { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ { type: 'terms', schema: 'segment', params: { field: '_type' } } ] - }); - const aggConfig = vis.aggs.byName('terms')[0]; - const filter = createFilterTerms(aggConfig, '__other__', { terms: ['apache'] })[0]; - expect(filter).to.have.property('query'); - expect(filter.query).to.have.property('bool'); - expect(filter.query.bool).to.have.property('should'); - expect(filter.query.bool.should[0]).to.have.property('match_phrase'); - expect(filter.query.bool.should[0].match_phrase).to.have.property('_type', 'apache'); - expect(filter).to.have.property('meta'); - expect(filter.meta).to.have.property('index', indexPattern.id); - expect(filter.meta).to.have.property('negate', true); - }); - }); -}); diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js b/src/legacy/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js deleted file mode 100644 index 7b8f099a1f9b4..0000000000000 --- a/src/legacy/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js +++ /dev/null @@ -1,124 +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 $ from 'jquery'; -import ngMock from 'ng_mock'; -import expect from '@kbn/expect'; -import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -import { VisProvider } from '../../../../vis'; -import { intervalOptions } from '../../../buckets/_interval_options'; - -describe.skip('editor', function () { - - let indexPattern; - let vis; - let agg; - let render; - let $scope; - - beforeEach(ngMock.module('kibana')); - beforeEach(ngMock.inject(function (Private, $injector, $compile) { - indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); - - const Vis = Private(VisProvider); - - /** - * Render the AggParams editor for the date histogram aggregation - * - * @param {object} params - the agg params to give to the date_histogram - * by default - * @return {object} - object pointing to the different inputs, keys - * are the aggParam name and the value is an object - * with $el, $scope, and a few helpers for getting - * data from them. - */ - render = function (params) { - vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ - { schema: 'metric', type: 'avg', params: { field: 'bytes' } }, - { schema: 'segment', type: 'date_histogram', params: params || {} } - ] - }); - - const $el = $('' + - ''); - const $parentScope = $injector.get('$rootScope').$new(); - - agg = $parentScope.agg = vis.aggs.bySchemaName('segment')[0]; - $parentScope.groupName = 'buckets'; - $parentScope.vis = vis; - - $compile($el)($parentScope); - $scope = $el.scope(); - $scope.$digest(); - - const $inputs = $('vis-agg-param-editor', $el); - return _.transform($inputs.toArray(), function (inputs, e) { - const $el = $(e); - const $scope = $el.scope(); - - inputs[$scope.aggParam.name] = { - $el: $el, - $scope: $scope, - $input: function () { - return $el.find('[ng-model]').first(); - }, - modelValue: function () { - return this.$input().controller('ngModel').$modelValue; - } - }; - }, {}); - }; - - })); - - describe('random field/interval', function () { - let params; - let field; - let interval; - - beforeEach(ngMock.inject(function () { - field = _.sample(indexPattern.fields); - interval = _.sample(intervalOptions); - params = render({ field: field, interval: interval.val }); - })); - - it('renders the field editor', function () { - expect(agg.params.field).to.be(field); - - expect(params).to.have.property('field'); - expect(params.field).to.have.property('$el'); - expect($scope.agg.params.field).to.be(field); - }); - - it('renders the interval editor', function () { - expect(agg.params.interval).to.be(interval.val); - - expect(params).to.have.property('interval'); - expect(params.interval).to.have.property('$el'); - expect($scope.agg.params.interval).to.be(interval.val); - }); - }); - - -}); diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js b/src/legacy/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js deleted file mode 100644 index 88646bd36ee80..0000000000000 --- a/src/legacy/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js +++ /dev/null @@ -1,215 +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 moment from 'moment'; -import expect from '@kbn/expect'; -import sinon from 'sinon'; -import ngMock from 'ng_mock'; -import AggParamWriterProvider from '../../agg_param_writer'; -import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -import chrome from '../../../../chrome'; -import { aggTypes } from '../../..'; -import { AggConfig } from '../../../agg_config'; -import { timefilter } from 'ui/timefilter'; - -const config = chrome.getUiSettingsClient(); - -describe('date_histogram params', function () { - - let paramWriter; - let writeInterval; - let write; - - let getTimeBounds; - let timeField; - - beforeEach(ngMock.module('kibana')); - beforeEach(ngMock.inject(function (Private) { - const AggParamWriter = Private(AggParamWriterProvider); - const indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); - - timeField = indexPattern.timeFieldName; - - paramWriter = new AggParamWriter({ aggType: 'date_histogram' }); - writeInterval = function (interval, timeRange, params = {}) { - return paramWriter.write({ ...params, interval: interval, field: timeField, timeRange: timeRange }); - }; - write = (params) => { - return paramWriter.write({ interval: '10s', ...params }); - }; - - const now = moment(); - getTimeBounds = function (n, units) { - timefilter.enableAutoRefreshSelector(); - timefilter.enableTimeRangeSelector(); - return { - from: now.clone().subtract(n, units), - to: now.clone() - }; - }; - })); - - describe('interval', function () { - it('accepts a valid calendar interval', function () { - const output = writeInterval('d'); - expect(output.params).to.have.property('calendar_interval', '1d'); - }); - - it('accepts a valid fixed interval', () => { - const output = writeInterval('100s'); - expect(output.params).to.have.property('fixed_interval', '100s'); - }); - - it('throws error when interval is invalid', function () { - expect(() => writeInterval('foo')).to.throw('TypeError: "foo" is not a valid interval.'); - }); - - it('automatically picks an interval', function () { - const timeBounds = getTimeBounds(15, 'm'); - const output = writeInterval('auto', timeBounds); - expect(output.params).to.have.property('fixed_interval', '30s'); - }); - - it('does not scale down the interval', () => { - const timeBounds = getTimeBounds(1, 'm'); - const output = writeInterval('h', timeBounds); - expect(output.params).to.have.property('calendar_interval', '1h'); - expect(output).not.to.have.property('metricScaleText'); - expect(output).not.to.have.property('metricScale'); - }); - - describe('scaling behavior', () => { - - it('should not scale without scaleMetricValues: true', function () { - const timeBounds = getTimeBounds(30, 'm'); - const output = writeInterval('s', timeBounds); - expect(output.params).to.have.property('fixed_interval', '10s'); - expect(output).not.to.have.property('metricScaleText'); - expect(output).not.to.property('metricScale'); - }); - - describe('only scales when all metrics are sum or count', function () { - const tests = [ - [ false, 'avg', 'count', 'sum' ], - [ true, 'count', 'sum' ], - [ false, 'count', 'cardinality' ] - ]; - - tests.forEach(function (test) { - const should = test.shift(); - const typeNames = test.slice(); - - it(typeNames.join(', ') + ' should ' + (should ? '' : 'not') + ' scale', function () { - const timeBounds = getTimeBounds(1, 'y'); - - const vis = paramWriter.vis; - vis.aggs.aggs.splice(0); - - const histoConfig = new AggConfig(vis.aggs, { - type: aggTypes.buckets.find(agg => agg.name === 'date_histogram'), - schema: 'segment', - params: { interval: 's', field: timeField, timeRange: timeBounds, scaleMetricValues: true } - }); - - vis.aggs.aggs.push(histoConfig); - - typeNames.forEach(function (type) { - vis.aggs.aggs.push(new AggConfig(vis.aggs, { - type: aggTypes.metrics.find(agg => agg.name === type), - schema: 'metric' - })); - }); - - const output = histoConfig.write(vis.aggs); - expect(_.has(output, 'metricScale')).to.be(should); - }); - }); - }); - }); - }); - - describe('time_zone', () => { - beforeEach(() => { - sinon.stub(config, 'get'); - sinon.stub(config, 'isDefault'); - }); - - it('should use the specified time_zone', () => { - const output = write({ time_zone: 'Europe/Kiev' }); - expect(output.params).to.have.property('time_zone', 'Europe/Kiev'); - }); - - it('should use the Kibana time_zone if no parameter specified', () => { - config.isDefault.withArgs('dateFormat:tz').returns(false); - config.get.withArgs('dateFormat:tz').returns('Europe/Riga'); - const output = write({}); - expect(output.params).to.have.property('time_zone', 'Europe/Riga'); - }); - - it('should use the fixed time_zone from the index pattern typeMeta', () => { - _.set(paramWriter.indexPattern, ['typeMeta', 'aggs', 'date_histogram', timeField, 'time_zone'], 'Europe/Rome'); - const output = write({ field: timeField }); - expect(output.params).to.have.property('time_zone', 'Europe/Rome'); - }); - - afterEach(() => { - config.get.restore(); - config.isDefault.restore(); - }); - }); - - describe('extended_bounds', function () { - it('should write a long value if a moment passed in', function () { - const then = moment(0); - const now = moment(500); - const output = write({ - extended_bounds: { - min: then, - max: now - } - }); - - expect(typeof output.params.extended_bounds.min).to.be('number'); - expect(typeof output.params.extended_bounds.max).to.be('number'); - expect(output.params.extended_bounds.min).to.be(then.valueOf()); - expect(output.params.extended_bounds.max).to.be(now.valueOf()); - - - }); - - it('should write a long if a long is passed', function () { - const then = 0; - const now = 500; - const output = write({ - extended_bounds: { - min: then, - max: now - } - }); - - expect(typeof output.params.extended_bounds.min).to.be('number'); - expect(typeof output.params.extended_bounds.max).to.be('number'); - expect(output.params.extended_bounds.min).to.be(then.valueOf()); - expect(output.params.extended_bounds.max).to.be(now.valueOf()); - - - }); - }); -}); diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/significant_terms.js b/src/legacy/ui/public/agg_types/__tests__/buckets/significant_terms.js deleted file mode 100644 index ae52fb476c120..0000000000000 --- a/src/legacy/ui/public/agg_types/__tests__/buckets/significant_terms.js +++ /dev/null @@ -1,95 +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 '@kbn/expect'; -import ngMock from 'ng_mock'; -import { aggTypes } from '../..'; - -describe('Significant Terms Agg', function () { - - describe('order agg editor UI', function () { - - describe('convert include/exclude from old format', function () { - - let $rootScope; - - function init({ aggParams = {} }) { - ngMock.module('kibana'); - ngMock.inject(function (_$rootScope_) { - const significantTerms = aggTypes.buckets.find(agg => agg.name === 'significant_terms'); - - $rootScope = _$rootScope_; - $rootScope.agg = { - id: 'test', - params: aggParams, - type: significantTerms, - getParam: key => aggParams[key], - }; - }); - } - - function testSerializeAndWrite(aggConfig) { - const includeArg = $rootScope.agg.type.paramByName('include'); - const excludeArg = $rootScope.agg.type.paramByName('exclude'); - - expect(includeArg.serialize(aggConfig.params.include, aggConfig)).to.equal('404'); - expect(excludeArg.serialize(aggConfig.params.exclude, aggConfig)).to.equal('400'); - - const output = { params: {} }; - - includeArg.write(aggConfig, output); - excludeArg.write(aggConfig, output); - - expect(output.params.include).to.equal('404'); - expect(output.params.exclude).to.equal('400'); - } - - it('it doesnt do anything with string type', function () { - init({ - aggParams: { - include: '404', - exclude: '400', - field: { - type: 'string' - }, - } - }); - - testSerializeAndWrite($rootScope.agg); - }); - - it('converts object to string type', function () { - init({ - aggParams: { - include: { - pattern: '404' - }, exclude: { - pattern: '400' - }, - field: { - type: 'string' - }, - } - }); - - testSerializeAndWrite($rootScope.agg); - }); - }); - }); -}); diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/terms.js b/src/legacy/ui/public/agg_types/__tests__/buckets/terms.js deleted file mode 100644 index 600323d32d38c..0000000000000 --- a/src/legacy/ui/public/agg_types/__tests__/buckets/terms.js +++ /dev/null @@ -1,193 +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 '@kbn/expect'; -import ngMock from 'ng_mock'; -import { aggTypes } from '../..'; - -describe('Terms Agg', function () { - describe('order agg editor UI', function () { - - let $rootScope; - - function init({ metricAggs = [], aggParams = {} }) { - ngMock.module('kibana'); - ngMock.inject(function ($controller, _$rootScope_) { - const terms = aggTypes.buckets.find(agg => agg.name === 'terms'); - const orderAggController = terms.paramByName('orderAgg').controller; - - $rootScope = _$rootScope_; - $rootScope.agg = { - id: 'test', - params: aggParams, - type: terms, - vis: { - aggs: [] - }, - getParam: key => aggParams[key], - }; - $rootScope.metricAggs = metricAggs; - $controller(orderAggController, { $scope: $rootScope }); - $rootScope.$digest(); - }); - } - - // should be rewritten after EUIficate order_agg.html - it.skip('selects _key if the selected metric becomes incompatible', function () { - init({ - metricAggs: [ - { - id: 'agg1', - type: { - name: 'count' - } - } - ] - }); - - expect($rootScope.agg.params.orderBy).to.be('agg1'); - $rootScope.metricAggs = [ - { - id: 'agg1', - type: { - name: 'top_hits' - } - } - ]; - $rootScope.$digest(); - expect($rootScope.agg.params.orderBy).to.be('_key'); - }); - - // should be rewritten after EUIficate order_agg.html - it.skip('selects _key if the selected metric is removed', function () { - init({ - metricAggs: [ - { - id: 'agg1', - type: { - name: 'count' - } - } - ] - }); - expect($rootScope.agg.params.orderBy).to.be('agg1'); - $rootScope.metricAggs = []; - $rootScope.$digest(); - expect($rootScope.agg.params.orderBy).to.be('_key'); - }); - - describe.skip('custom field formatter', () => { - beforeEach(() => { - init({ - metricAggs: [ - { - id: 'agg1', - type: { - name: 'count' - } - } - ], - aggParams: { - otherBucketLabel: 'Other', - missingBucketLabel: 'Missing' - } - }); - $rootScope.$digest(); - }); - - it ('converts __other__ key', () => { - const formatter = $rootScope.agg.type.getFormat($rootScope.agg).getConverterFor('text'); - expect(formatter('__other__')).to.be('Other'); - }); - - it ('converts __missing__ key', () => { - const formatter = $rootScope.agg.type.getFormat($rootScope.agg).getConverterFor('text'); - expect(formatter('__missing__')).to.be('Missing'); - }); - }); - - it('adds "custom metric" option'); - it('lists all metric agg responses'); - it('lists individual values of a multi-value metric'); - it('displays a metric editor if "custom metric" is selected'); - it('saves the "custom metric" to state and refreshes from it'); - it('invalidates the form if the metric agg form is not complete'); - - describe.skip('convert include/exclude from old format', function () { - - it('it doesnt do anything with string type', function () { - init({ - aggParams: { - include: '404', - exclude: '400', - field: { - type: 'string' - }, - } - }); - - const aggConfig = $rootScope.agg; - const includeArg = $rootScope.agg.type.params.byName.include; - const excludeArg = $rootScope.agg.type.params.byName.exclude; - - expect(includeArg.serialize(aggConfig.params.include, aggConfig)).to.equal('404'); - expect(excludeArg.serialize(aggConfig.params.exclude, aggConfig)).to.equal('400'); - - const output = { params: {} }; - - includeArg.write(aggConfig, output); - excludeArg.write(aggConfig, output); - - expect(output.params.include).to.equal('404'); - expect(output.params.exclude).to.equal('400'); - }); - - it('converts object to string type', function () { - init({ - aggParams: { - include: { - pattern: '404' - }, exclude: { - pattern: '400' - }, - field: { - type: 'string' - }, - } - }); - - const aggConfig = $rootScope.agg; - const includeArg = $rootScope.agg.type.params.byName.include; - const excludeArg = $rootScope.agg.type.params.byName.exclude; - - expect(includeArg.serialize(aggConfig.params.include, aggConfig)).to.equal('404'); - expect(excludeArg.serialize(aggConfig.params.exclude, aggConfig)).to.equal('400'); - - const output = { params: {} }; - - includeArg.write(aggConfig, output); - excludeArg.write(aggConfig, output); - - expect(output.params.include).to.equal('404'); - expect(output.params.exclude).to.equal('400'); - }); - - }); - }); -}); diff --git a/src/legacy/ui/public/agg_types/__tests__/utils/_stub_agg_params.js b/src/legacy/ui/public/agg_types/__tests__/utils/_stub_agg_params.js deleted file mode 100644 index f30572bcc0ed5..0000000000000 --- a/src/legacy/ui/public/agg_types/__tests__/utils/_stub_agg_params.js +++ /dev/null @@ -1,67 +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 sinon from 'sinon'; -import { BaseParamType } from '../../param_types/base'; -import { FieldParamType } from '../../param_types/field'; -import { OptionedParamType } from '../../param_types/optioned'; -import { createLegacyClass } from '../../../utils/legacy_class'; - -function ParamClassStub(parent, body) { - const stub = sinon.spy(body || function () { - stub.Super && stub.Super.call(this); - }); - if (parent) createLegacyClass(stub).inherits(parent); - return stub; -} - -/** - * stub all of the param classes, but ensure that they still inherit properly. - * This method should be passed directly to ngMock.inject(); - * - * ```js - * let stubParamClasses = require('./utils/_stub_agg_params'); - * describe('something', function () { - * beforeEach(ngMock.inject(stubParamClasses)); - * }) - * ``` - * - * @param {PrivateLoader} Private - The private module loader, inject by passing this function to ngMock.inject() - * @return {undefined} - */ -// eslint-disable-next-line import/no-default-export -export default function stubParamClasses(Private) { - const BaseAggParam = Private.stub( - BaseParamType, - new ParamClassStub(null, function (config) { - _.assign(this, config); - }) - ); - - Private.stub( - FieldParamType, - new ParamClassStub(BaseAggParam) - ); - - Private.stub( - OptionedParamType, - new ParamClassStub(BaseAggParam) - ); -} diff --git a/src/legacy/ui/public/agg_types/agg_config.ts b/src/legacy/ui/public/agg_types/agg_config.ts index a5b1aa7cf9c0b..eedfc1cc05a84 100644 --- a/src/legacy/ui/public/agg_types/agg_config.ts +++ b/src/legacy/ui/public/agg_types/agg_config.ts @@ -332,7 +332,7 @@ export class AggConfig { return this.type.getValue(this, bucket); } - getKey(bucket: any, key: string) { + getKey(bucket: any, key?: string) { if (this.type.getKey) { return this.type.getKey(bucket, key, this); } else { diff --git a/src/legacy/ui/public/agg_types/buckets/_terms_other_bucket_helper.js b/src/legacy/ui/public/agg_types/buckets/_terms_other_bucket_helper.js index 5dfa2e3d6ae3f..70bca2e40ae3f 100644 --- a/src/legacy/ui/public/agg_types/buckets/_terms_other_bucket_helper.js +++ b/src/legacy/ui/public/agg_types/buckets/_terms_other_bucket_helper.js @@ -18,8 +18,9 @@ */ import _ from 'lodash'; -import { buildExistsFilter, buildPhrasesFilter, buildQueryFromFilters } from '@kbn/es-query'; +import { buildQueryFromFilters } from '@kbn/es-query'; import { AggGroupNames } from '../../vis/editors/default/agg_groups'; +import { esFilters } from '../../../../../plugins/data/public'; /** * walks the aggregation DSL and returns DSL starting at aggregation with id of startFromAggId @@ -180,7 +181,7 @@ export const buildOtherBucketAgg = (aggConfigs, aggWithOtherBucket, response) => agg.buckets.some(bucket => bucket.key === '__missing__') ) { filters.push( - buildExistsFilter( + esFilters.buildExistsFilter( aggWithOtherBucket.params.field, aggWithOtherBucket.params.field.indexPattern ) @@ -232,7 +233,7 @@ export const mergeOtherBucketAggResponse = ( ); const requestFilterTerms = getOtherAggTerms(requestAgg, key, otherAgg); - const phraseFilter = buildPhrasesFilter( + const phraseFilter = esFilters.buildPhrasesFilter( otherAgg.params.field, requestFilterTerms, otherAgg.params.field.indexPattern @@ -243,7 +244,7 @@ export const mergeOtherBucketAggResponse = ( if (aggResultBuckets.some(bucket => bucket.key === '__missing__')) { bucket.filters.push( - buildExistsFilter(otherAgg.params.field, otherAgg.params.field.indexPattern) + esFilters.buildExistsFilter(otherAgg.params.field, otherAgg.params.field.indexPattern) ); } aggResultBuckets.push(bucket); diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/date_histogram.test.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/date_histogram.test.ts new file mode 100644 index 0000000000000..9426df7d34c29 --- /dev/null +++ b/src/legacy/ui/public/agg_types/buckets/create_filter/date_histogram.test.ts @@ -0,0 +1,122 @@ +/* + * 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 { createFilterDateHistogram } from './date_histogram'; +import { intervalOptions } from '../_interval_options'; +import { AggConfigs } from '../../agg_configs'; +import { IBucketDateHistogramAggConfig } from '../date_histogram'; +import { BUCKET_TYPES } from '../bucket_agg_types'; +import { esFilters } from '../../../../../../plugins/data/public'; + +jest.mock('ui/new_platform'); + +describe('AggConfig Filters', () => { + describe('date_histogram', () => { + let agg: IBucketDateHistogramAggConfig; + let filter: esFilters.RangeFilter; + let bucketStart: any; + let field: any; + + const init = (interval: string = 'auto', duration: any = moment.duration(15, 'minutes')) => { + field = { + name: 'date', + }; + + const indexPattern = { + id: '1234', + title: 'logstash-*', + fields: { + getByName: () => field, + filter: () => [field], + }, + } as any; + const aggConfigs = new AggConfigs( + indexPattern, + [ + { + type: BUCKET_TYPES.DATE_HISTOGRAM, + schema: 'segment', + params: { field: field.name, interval, customInterval: '5d' }, + }, + ], + null + ); + const bucketKey = 1422579600000; + + agg = aggConfigs.aggs[0] as IBucketDateHistogramAggConfig; + bucketStart = moment(bucketKey); + + const timePad = moment.duration(duration / 2); + + agg.buckets.setBounds({ + min: bucketStart.clone().subtract(timePad), + max: bucketStart.clone().add(timePad), + }); + agg.buckets.setInterval(interval); + filter = createFilterDateHistogram(agg, bucketKey); + }; + + it('creates a valid range filter', () => { + init(); + + expect(filter).toHaveProperty('range'); + expect(filter.range).toHaveProperty(field.name); + + const fieldParams = filter.range[field.name]; + expect(fieldParams).toHaveProperty('gte'); + expect(typeof fieldParams.gte).toBe('string'); + + expect(fieldParams).toHaveProperty('lt'); + expect(typeof fieldParams.lt).toBe('string'); + + expect(fieldParams).toHaveProperty('format'); + expect(fieldParams.format).toBe('strict_date_optional_time'); + + expect(filter).toHaveProperty('meta'); + expect(filter.meta).toHaveProperty('index', '1234'); + }); + + it('extends the filter edge to 1ms before the next bucket for all interval options', () => { + intervalOptions.forEach(option => { + let duration; + if (option.val !== 'custom' && moment(1, option.val).isValid()) { + // @ts-ignore + duration = moment.duration(10, option.val); + + if (+duration < 10) { + throw new Error('unable to create interval for ' + option.val); + } + } + init(option.val, duration); + + const interval = agg.buckets.getInterval(); + const params = filter.range[field.name]; + + expect(params.gte).toBe(bucketStart.toISOString()); + expect(params.lt).toBe( + bucketStart + .clone() + .add(interval) + .toISOString() + ); + }); + }); + }); +}); diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/date_histogram.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/date_histogram.ts index 6bda085335309..f91a92eab1c33 100644 --- a/src/legacy/ui/public/agg_types/buckets/create_filter/date_histogram.ts +++ b/src/legacy/ui/public/agg_types/buckets/create_filter/date_histogram.ts @@ -18,14 +18,17 @@ */ import moment from 'moment'; -import { buildRangeFilter } from '@kbn/es-query'; import { IBucketDateHistogramAggConfig } from '../date_histogram'; +import { esFilters } from '../../../../../../plugins/data/public'; -export const createFilterDateHistogram = (agg: IBucketDateHistogramAggConfig, key: string) => { +export const createFilterDateHistogram = ( + agg: IBucketDateHistogramAggConfig, + key: string | number +) => { const start = moment(key); const interval = agg.buckets.getInterval(); - return buildRangeFilter( + return esFilters.buildRangeFilter( agg.params.field, { gte: start.toISOString(), diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/date_range.test.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/date_range.test.ts new file mode 100644 index 0000000000000..35b6c38bad799 --- /dev/null +++ b/src/legacy/ui/public/agg_types/buckets/create_filter/date_range.test.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 moment from 'moment'; +import { createFilterDateRange } from './date_range'; +import { DateFormat } from '../../../../../../plugins/data/common'; +import { AggConfigs } from '../../agg_configs'; +import { BUCKET_TYPES } from '../bucket_agg_types'; + +jest.mock('ui/new_platform'); + +describe('AggConfig Filters', () => { + describe('Date range', () => { + const getAggConfigs = () => { + const field = { + name: '@timestamp', + format: new DateFormat({}, () => {}), + }; + + const indexPattern = { + id: '1234', + title: 'logstash-*', + fields: { + getByName: () => field, + filter: () => [field], + }, + } as any; + + return new AggConfigs( + indexPattern, + [ + { + type: BUCKET_TYPES.DATE_RANGE, + params: { + field: '@timestamp', + ranges: [{ from: '2014-01-01', to: '2014-12-31' }], + }, + }, + ], + null + ); + }; + + it('should return a range filter for date_range agg', () => { + const aggConfigs = getAggConfigs(); + const from = new Date('1 Feb 2015'); + const to = new Date('7 Feb 2015'); + const filter = createFilterDateRange(aggConfigs.aggs[0], { + from: from.valueOf(), + to: to.valueOf(), + }); + + expect(filter).toHaveProperty('range'); + expect(filter).toHaveProperty('meta'); + expect(filter.meta).toHaveProperty('index', '1234'); + expect(filter.range).toHaveProperty('@timestamp'); + expect(filter.range['@timestamp']).toHaveProperty('gte', moment(from).toISOString()); + expect(filter.range['@timestamp']).toHaveProperty('lt', moment(to).toISOString()); + }); + }); +}); diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/date_range.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/date_range.ts index cd4b0ffc215b0..01689d954a072 100644 --- a/src/legacy/ui/public/agg_types/buckets/create_filter/date_range.ts +++ b/src/legacy/ui/public/agg_types/buckets/create_filter/date_range.ts @@ -17,16 +17,16 @@ * under the License. */ -import { buildRangeFilter, RangeFilterParams } from '@kbn/es-query'; import moment from 'moment'; import { IBucketAggConfig } from '../_bucket_agg_type'; import { DateRangeKey } from '../date_range'; +import { esFilters } from '../../../../../../plugins/data/public'; export const createFilterDateRange = (agg: IBucketAggConfig, { from, to }: DateRangeKey) => { - const filter: RangeFilterParams = {}; + const filter: esFilters.RangeFilterParams = {}; if (from) filter.gte = moment(from).toISOString(); if (to) filter.lt = moment(to).toISOString(); if (to && from) filter.format = 'strict_date_optional_time'; - return buildRangeFilter(agg.params.field, filter, agg.getIndexPattern()); + return esFilters.buildRangeFilter(agg.params.field, filter, agg.getIndexPattern()); }; diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/filters.test.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/filters.test.ts new file mode 100644 index 0000000000000..125532fe070ba --- /dev/null +++ b/src/legacy/ui/public/agg_types/buckets/create_filter/filters.test.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 { createFilterFilters } from './filters'; +import { AggConfigs } from '../../agg_configs'; + +jest.mock('ui/new_platform'); + +describe('AggConfig Filters', () => { + describe('filters', () => { + const getAggConfigs = () => { + const field = { + name: 'bytes', + }; + + const indexPattern = { + id: '1234', + title: 'logstash-*', + fields: { + getByName: () => field, + filter: () => [field], + }, + } as any; + + return new AggConfigs( + indexPattern, + [ + { + type: 'filters', + schema: 'segment', + params: { + filters: [ + { input: { query: 'type:apache', language: 'lucene' } }, + { input: { query: 'type:nginx', language: 'lucene' } }, + ], + }, + }, + ], + null + ); + }; + it('should return a filters filter', () => { + const aggConfigs = getAggConfigs(); + const filter = createFilterFilters(aggConfigs.aggs[0], 'type:nginx'); + + expect(filter!.query.bool.must[0].query_string.query).toBe('type:nginx'); + expect(filter!.meta).toHaveProperty('index', '1234'); + expect(filter!.meta).toHaveProperty('alias', 'type:nginx'); + }); + }); +}); diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/filters.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/filters.ts index bf30b333056bc..6b614514580b6 100644 --- a/src/legacy/ui/public/agg_types/buckets/create_filter/filters.ts +++ b/src/legacy/ui/public/agg_types/buckets/create_filter/filters.ts @@ -18,8 +18,8 @@ */ import { get } from 'lodash'; -import { buildQueryFilter } from '@kbn/es-query'; import { IBucketAggConfig } from '../_bucket_agg_type'; +import { esFilters } from '../../../../../../plugins/data/public'; export const createFilterFilters = (aggConfig: IBucketAggConfig, key: string) => { // have the aggConfig write agg dsl params @@ -28,6 +28,6 @@ export const createFilterFilters = (aggConfig: IBucketAggConfig, key: string) => const indexPattern = aggConfig.getIndexPattern(); if (filter && indexPattern && indexPattern.id) { - return buildQueryFilter(filter.query, indexPattern.id, key); + return esFilters.buildQueryFilter(filter.query, indexPattern.id, key); } }; diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/histogram.test.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/histogram.test.ts new file mode 100644 index 0000000000000..0095df75b8914 --- /dev/null +++ b/src/legacy/ui/public/agg_types/buckets/create_filter/histogram.test.ts @@ -0,0 +1,73 @@ +/* + * 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 { createFilterHistogram } from './histogram'; +import { AggConfigs } from '../../agg_configs'; +import { BUCKET_TYPES } from '../bucket_agg_types'; +import { BytesFormat } from '../../../../../../plugins/data/common'; + +jest.mock('ui/new_platform'); + +describe('AggConfig Filters', () => { + describe('histogram', () => { + const getAggConfigs = () => { + const field = { + name: 'bytes', + format: new BytesFormat({}, () => {}), + }; + + const indexPattern = { + id: '1234', + title: 'logstash-*', + fields: { + getByName: () => field, + filter: () => [field], + }, + } as any; + + return new AggConfigs( + indexPattern, + [ + { + id: BUCKET_TYPES.HISTOGRAM, + type: BUCKET_TYPES.HISTOGRAM, + schema: 'buckets', + params: { + field: 'bytes', + interval: 1024, + }, + }, + ], + null + ); + }; + + it('should return an range filter for histogram', () => { + const aggConfigs = getAggConfigs(); + const filter = createFilterHistogram(aggConfigs.aggs[0], '2048'); + + expect(filter).toHaveProperty('meta'); + expect(filter.meta).toHaveProperty('index', '1234'); + expect(filter).toHaveProperty('range'); + expect(filter.range).toHaveProperty('bytes'); + expect(filter.range.bytes).toHaveProperty('gte', 2048); + expect(filter.range.bytes).toHaveProperty('lt', 3072); + expect(filter.meta).toHaveProperty('formattedValue', '2,048'); + }); + }); +}); diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/histogram.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/histogram.ts index 37d5c6bc8adc1..fc587fa9ecdb6 100644 --- a/src/legacy/ui/public/agg_types/buckets/create_filter/histogram.ts +++ b/src/legacy/ui/public/agg_types/buckets/create_filter/histogram.ts @@ -17,14 +17,14 @@ * under the License. */ -import { buildRangeFilter, RangeFilterParams } from '@kbn/es-query'; import { IBucketAggConfig } from '../_bucket_agg_type'; +import { esFilters } from '../../../../../../plugins/data/public'; export const createFilterHistogram = (aggConfig: IBucketAggConfig, key: string) => { const value = parseInt(key, 10); - const params: RangeFilterParams = { gte: value, lt: value + aggConfig.params.interval }; + const params: esFilters.RangeFilterParams = { gte: value, lt: value + aggConfig.params.interval }; - return buildRangeFilter( + return esFilters.buildRangeFilter( aggConfig.params.field, params, aggConfig.getIndexPattern(), diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/ip_range.test.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/ip_range.test.ts new file mode 100644 index 0000000000000..2e030d820b396 --- /dev/null +++ b/src/legacy/ui/public/agg_types/buckets/create_filter/ip_range.test.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. + */ + +import { createFilterIpRange } from './ip_range'; +import { AggConfigs } from '../../agg_configs'; +import { IpFormat } from '../../../../../../plugins/data/common'; +import { BUCKET_TYPES } from '../bucket_agg_types'; + +jest.mock('ui/new_platform'); + +describe('AggConfig Filters', () => { + describe('IP range', () => { + const getAggConfigs = (aggs: Array>) => { + const field = { + name: 'ip', + format: IpFormat, + }; + + const indexPattern = { + id: '1234', + title: 'logstash-*', + fields: { + getByName: () => field, + filter: () => [field], + }, + } as any; + + return new AggConfigs(indexPattern, aggs, null); + }; + + it('should return a range filter for ip_range agg', () => { + const aggConfigs = getAggConfigs([ + { + type: BUCKET_TYPES.IP_RANGE, + schema: 'segment', + params: { + field: 'ip', + ipRangeType: 'range', + ranges: { + fromTo: [{ from: '0.0.0.0', to: '1.1.1.1' }], + }, + }, + }, + ]); + + const filter = createFilterIpRange(aggConfigs.aggs[0], { + type: 'range', + from: '0.0.0.0', + to: '1.1.1.1', + }); + + expect(filter).toHaveProperty('range'); + expect(filter).toHaveProperty('meta'); + expect(filter.meta).toHaveProperty('index', '1234'); + expect(filter.range).toHaveProperty('ip'); + expect(filter.range.ip).toHaveProperty('gte', '0.0.0.0'); + expect(filter.range.ip).toHaveProperty('lte', '1.1.1.1'); + }); + + it('should return a range filter for ip_range agg using a CIDR mask', () => { + const aggConfigs = getAggConfigs([ + { + type: BUCKET_TYPES.IP_RANGE, + schema: 'segment', + params: { + field: 'ip', + ipRangeType: 'mask', + ranges: { + mask: [{ mask: '67.129.65.201/27' }], + }, + }, + }, + ]); + + const filter = createFilterIpRange(aggConfigs.aggs[0], { + type: 'mask', + mask: '67.129.65.201/27', + }); + + expect(filter).toHaveProperty('range'); + expect(filter).toHaveProperty('meta'); + expect(filter.meta).toHaveProperty('index', '1234'); + expect(filter.range).toHaveProperty('ip'); + expect(filter.range.ip).toHaveProperty('gte', '67.129.65.192'); + expect(filter.range.ip).toHaveProperty('lte', '67.129.65.223'); + }); + }); +}); diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/ip_range.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/ip_range.ts index 83769578725f2..803f6d97ae42d 100644 --- a/src/legacy/ui/public/agg_types/buckets/create_filter/ip_range.ts +++ b/src/legacy/ui/public/agg_types/buckets/create_filter/ip_range.ts @@ -17,13 +17,13 @@ * under the License. */ -import { buildRangeFilter, RangeFilterParams } from '@kbn/es-query'; import { CidrMask } from '../../../utils/cidr_mask'; import { IBucketAggConfig } from '../_bucket_agg_type'; import { IpRangeKey } from '../ip_range'; +import { esFilters } from '../../../../../../plugins/data/public'; export const createFilterIpRange = (aggConfig: IBucketAggConfig, key: IpRangeKey) => { - let range: RangeFilterParams; + let range: esFilters.RangeFilterParams; if (key.type === 'mask') { range = new CidrMask(key.mask).getRange(); @@ -34,7 +34,7 @@ export const createFilterIpRange = (aggConfig: IBucketAggConfig, key: IpRangeKey }; } - return buildRangeFilter( + return esFilters.buildRangeFilter( aggConfig.params.field, { gte: range.from, lte: range.to }, aggConfig.getIndexPattern() diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/range.test.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/range.test.ts new file mode 100644 index 0000000000000..04476ba62ccd5 --- /dev/null +++ b/src/legacy/ui/public/agg_types/buckets/create_filter/range.test.ts @@ -0,0 +1,74 @@ +/* + * 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 { createFilterRange } from './range'; +import { BytesFormat } from '../../../../../../plugins/data/common'; +import { AggConfigs } from '../../agg_configs'; +import { BUCKET_TYPES } from '../bucket_agg_types'; + +jest.mock('ui/new_platform'); + +describe('AggConfig Filters', () => { + describe('range', () => { + const getAggConfigs = () => { + const field = { + name: 'bytes', + format: new BytesFormat({}, () => {}), + }; + + const indexPattern = { + id: '1234', + title: 'logstash-*', + fields: { + getByName: () => field, + filter: () => [field], + }, + } as any; + + return new AggConfigs( + indexPattern, + [ + { + id: BUCKET_TYPES.RANGE, + type: BUCKET_TYPES.RANGE, + schema: 'buckets', + params: { + field: 'bytes', + ranges: [{ from: 1024, to: 2048 }], + }, + }, + ], + null + ); + }; + + it('should return a range filter for range agg', () => { + const aggConfigs = getAggConfigs(); + const filter = createFilterRange(aggConfigs.aggs[0], { gte: 1024, lt: 2048.0 }); + + expect(filter).toHaveProperty('range'); + expect(filter).toHaveProperty('meta'); + expect(filter.meta).toHaveProperty('index', '1234'); + expect(filter.range).toHaveProperty('bytes'); + expect(filter.range.bytes).toHaveProperty('gte', 1024.0); + expect(filter.range.bytes).toHaveProperty('lt', 2048.0); + expect(filter.meta).toHaveProperty('formattedValue', '≥ 1,024 and < 2,048'); + }); + }); +}); diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/range.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/range.ts index cf2c83884651a..929827c6e3fec 100644 --- a/src/legacy/ui/public/agg_types/buckets/create_filter/range.ts +++ b/src/legacy/ui/public/agg_types/buckets/create_filter/range.ts @@ -17,11 +17,11 @@ * under the License. */ -import { buildRangeFilter } from '@kbn/es-query'; import { IBucketAggConfig } from '../_bucket_agg_type'; +import { esFilters } from '../../../../../../plugins/data/public'; export const createFilterRange = (aggConfig: IBucketAggConfig, params: any) => { - return buildRangeFilter( + return esFilters.buildRangeFilter( aggConfig.params.field, params, aggConfig.getIndexPattern(), diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/terms.test.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/terms.test.ts new file mode 100644 index 0000000000000..42f8349d5a2a3 --- /dev/null +++ b/src/legacy/ui/public/agg_types/buckets/create_filter/terms.test.ts @@ -0,0 +1,118 @@ +/* + * 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 { createFilterTerms } from './terms'; +import { AggConfigs } from '../../agg_configs'; +import { BUCKET_TYPES } from '../bucket_agg_types'; +import { esFilters } from '../../../../../../plugins/data/public'; + +jest.mock('ui/new_platform'); + +describe('AggConfig Filters', () => { + describe('terms', () => { + const getAggConfigs = (aggs: Array>) => { + const indexPattern = { + id: '1234', + title: 'logstash-*', + fields: { + getByName: () => field, + filter: () => [field], + }, + } as any; + + const field = { + name: 'field', + indexPattern, + }; + + return new AggConfigs(indexPattern, aggs, null); + }; + + it('should return a match_phrase filter for terms', () => { + const aggConfigs = getAggConfigs([ + { type: BUCKET_TYPES.TERMS, schema: 'segment', params: { field: 'field' } }, + ]); + + const filter = createFilterTerms(aggConfigs.aggs[0], 'apache', {}) as esFilters.Filter; + + expect(filter).toHaveProperty('query'); + expect(filter.query).toHaveProperty('match_phrase'); + expect(filter.query.match_phrase).toHaveProperty('field'); + expect(filter.query.match_phrase.field).toBe('apache'); + expect(filter).toHaveProperty('meta'); + expect(filter.meta).toHaveProperty('index', '1234'); + }); + + it('should set query to true or false for boolean filter', () => { + const aggConfigs = getAggConfigs([ + { type: BUCKET_TYPES.TERMS, schema: 'segment', params: { field: 'field' } }, + ]); + + const filterFalse = createFilterTerms(aggConfigs.aggs[0], '', {}) as esFilters.Filter; + + expect(filterFalse).toHaveProperty('query'); + expect(filterFalse.query).toHaveProperty('match_phrase'); + expect(filterFalse.query.match_phrase).toHaveProperty('field'); + expect(filterFalse.query.match_phrase.field).toBeFalsy(); + + const filterTrue = createFilterTerms(aggConfigs.aggs[0], '1', {}) as esFilters.Filter; + + expect(filterTrue).toHaveProperty('query'); + expect(filterTrue.query).toHaveProperty('match_phrase'); + expect(filterTrue.query.match_phrase).toHaveProperty('field'); + expect(filterTrue.query.match_phrase.field).toBeTruthy(); + }); + // + it('should generate correct __missing__ filter', () => { + const aggConfigs = getAggConfigs([ + { type: BUCKET_TYPES.TERMS, schema: 'segment', params: { field: 'field' } }, + ]); + const filter = createFilterTerms( + aggConfigs.aggs[0], + '__missing__', + {} + ) as esFilters.ExistsFilter; + + expect(filter).toHaveProperty('exists'); + expect(filter.exists).toHaveProperty('field', 'field'); + expect(filter).toHaveProperty('meta'); + expect(filter.meta).toHaveProperty('index', '1234'); + expect(filter.meta).toHaveProperty('negate', true); + }); + // + it('should generate correct __other__ filter', () => { + const aggConfigs = getAggConfigs([ + { type: BUCKET_TYPES.TERMS, schema: 'segment', params: { field: 'field' } }, + ]); + + const [filter] = createFilterTerms(aggConfigs.aggs[0], '__other__', { + terms: ['apache'], + }) as esFilters.Filter[]; + + expect(filter).toHaveProperty('query'); + expect(filter.query).toHaveProperty('bool'); + expect(filter.query.bool).toHaveProperty('should'); + expect(filter.query.bool.should[0]).toHaveProperty('match_phrase'); + expect(filter.query.bool.should[0].match_phrase).toHaveProperty('field', 'apache'); + expect(filter).toHaveProperty('meta'); + expect(filter.meta).toHaveProperty('index', '1234'); + expect(filter.meta).toHaveProperty('negate', true); + }); + }); +}); diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/terms.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/terms.ts index e5d4406c752c7..5bd770e672786 100644 --- a/src/legacy/ui/public/agg_types/buckets/create_filter/terms.ts +++ b/src/legacy/ui/public/agg_types/buckets/create_filter/terms.ts @@ -17,8 +17,8 @@ * under the License. */ -import { Filter, buildPhraseFilter, buildPhrasesFilter, buildExistsFilter } from '@kbn/es-query'; import { IBucketAggConfig } from '../_bucket_agg_type'; +import { esFilters } from '../../../../../../plugins/data/public'; export const createFilterTerms = (aggConfig: IBucketAggConfig, key: string, params: any) => { const field = aggConfig.params.field; @@ -27,20 +27,20 @@ export const createFilterTerms = (aggConfig: IBucketAggConfig, key: string, para if (key === '__other__') { const terms = params.terms; - const phraseFilter = buildPhrasesFilter(field, terms, indexPattern); + const phraseFilter = esFilters.buildPhrasesFilter(field, terms, indexPattern); phraseFilter.meta.negate = true; - const filters: Filter[] = [phraseFilter]; + const filters: esFilters.Filter[] = [phraseFilter]; if (terms.some((term: string) => term === '__missing__')) { - filters.push(buildExistsFilter(field, indexPattern)); + filters.push(esFilters.buildExistsFilter(field, indexPattern)); } return filters; } else if (key === '__missing__') { - const existsFilter = buildExistsFilter(field, indexPattern); + const existsFilter = esFilters.buildExistsFilter(field, indexPattern); existsFilter.meta.negate = true; return existsFilter; } - return buildPhraseFilter(field, key, indexPattern); + return esFilters.buildPhraseFilter(field, key, indexPattern); }; diff --git a/src/legacy/ui/public/agg_types/buckets/date_histogram.ts b/src/legacy/ui/public/agg_types/buckets/date_histogram.ts index 4c2e67f758a7e..e86d561a1c79b 100644 --- a/src/legacy/ui/public/agg_types/buckets/date_histogram.ts +++ b/src/legacy/ui/public/agg_types/buckets/date_histogram.ts @@ -32,7 +32,6 @@ import { ScaleMetricsParamEditor } from '../../vis/editors/default/controls/scal import { dateHistogramInterval } from '../../../../core_plugins/data/public'; import { writeParams } from '../agg_params'; import { AggConfigs } from '../agg_configs'; -import { AggConfig } from '../agg_config'; import { isMetricAggType } from '../metrics/metric_agg_type'; import { KBN_FIELD_TYPES } from '../../../../../plugins/data/common'; @@ -189,7 +188,7 @@ export const dateHistogramBucketAgg = new BucketAggType isMetricAggType(a.type)); - const all = _.every(metrics, (a: AggConfig) => { + const all = _.every(metrics, (a: IBucketAggConfig) => { const { type } = a; if (isMetricAggType(type)) { diff --git a/src/legacy/ui/public/agg_types/buckets/date_range.test.ts b/src/legacy/ui/public/agg_types/buckets/date_range.test.ts new file mode 100644 index 0000000000000..7d9fe002636a2 --- /dev/null +++ b/src/legacy/ui/public/agg_types/buckets/date_range.test.ts @@ -0,0 +1,112 @@ +/* + * 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 { AggConfigs } from '../agg_configs'; +import { BUCKET_TYPES } from './bucket_agg_types'; +import { npStart } from 'ui/new_platform'; + +jest.mock('ui/new_platform'); + +describe('date_range params', () => { + const getAggConfigs = (params: Record = {}, hasIncludeTypeMeta: boolean = true) => { + const field = { + name: 'bytes', + }; + + const indexPattern = { + id: '1234', + title: 'logstash-*', + fields: { + getByName: () => field, + filter: () => [field], + }, + typeMeta: hasIncludeTypeMeta + ? { + aggs: { + date_range: { + bytes: { + time_zone: 'defaultTimeZone', + }, + }, + }, + } + : undefined, + } as any; + + return new AggConfigs( + indexPattern, + [ + { + id: BUCKET_TYPES.DATE_RANGE, + type: BUCKET_TYPES.DATE_RANGE, + schema: 'buckets', + params, + }, + ], + null + ); + }; + + describe('getKey', () => { + it('should return object', () => { + const aggConfigs = getAggConfigs(); + const dateRange = aggConfigs.aggs[0]; + const bucket = { from: 'from-date', to: 'to-date', key: 'from-dateto-date' }; + + expect(dateRange.getKey(bucket)).toEqual({ from: 'from-date', to: 'to-date' }); + }); + }); + + describe('time_zone', () => { + it('should use the specified time_zone', () => { + const aggConfigs = getAggConfigs({ + time_zone: 'Europe/Minsk', + field: 'bytes', + }); + const dateRange = aggConfigs.aggs[0]; + const params = dateRange.toDsl()[BUCKET_TYPES.DATE_RANGE]; + + expect(params.time_zone).toBe('Europe/Minsk'); + }); + + it('should use the fixed time_zone from the index pattern typeMeta', () => { + const aggConfigs = getAggConfigs({ + field: 'bytes', + }); + const dateRange = aggConfigs.aggs[0]; + const params = dateRange.toDsl()[BUCKET_TYPES.DATE_RANGE]; + + expect(params.time_zone).toBe('defaultTimeZone'); + }); + + it('should use the Kibana time_zone if no parameter specified', () => { + npStart.core.uiSettings.get = jest.fn(() => 'kibanaTimeZone'); + + const aggConfigs = getAggConfigs( + { + field: 'bytes', + }, + false + ); + const dateRange = aggConfigs.aggs[0]; + const params = dateRange.toDsl()[BUCKET_TYPES.DATE_RANGE]; + + expect(params.time_zone).toBe('kibanaTimeZone'); + }); + }); +}); diff --git a/src/legacy/ui/public/agg_types/buckets/date_range.ts b/src/legacy/ui/public/agg_types/buckets/date_range.ts index dd7f0cb972ae2..4de6002e2e374 100644 --- a/src/legacy/ui/public/agg_types/buckets/date_range.ts +++ b/src/legacy/ui/public/agg_types/buckets/date_range.ts @@ -21,9 +21,8 @@ import moment from 'moment-timezone'; import { i18n } from '@kbn/i18n'; import { npStart } from 'ui/new_platform'; import { BUCKET_TYPES } from './bucket_agg_types'; -import { BucketAggType } from './_bucket_agg_type'; +import { BucketAggType, IBucketAggConfig } from './_bucket_agg_type'; import { createFilterDateRange } from './create_filter/date_range'; -import { AggConfig } from '../agg_config'; import { FieldFormat } from '../../../../../plugins/data/common/field_formats'; import { DateRangesParamEditor } from '../../vis/editors/default/controls/date_ranges'; @@ -64,7 +63,7 @@ export const dateRangeBucketAgg = new BucketAggType({ name: 'field', type: 'field', filterFieldTypes: KBN_FIELD_TYPES.DATE, - default(agg: AggConfig) { + default(agg: IBucketAggConfig) { return agg.getIndexPattern().timeFieldName; }, }, @@ -83,7 +82,7 @@ export const dateRangeBucketAgg = new BucketAggType({ default: undefined, // Implimentation method is the same as that of date_histogram serialize: () => undefined, - write: (agg: AggConfig, output: Record) => { + write: (agg: IBucketAggConfig, output: Record) => { const field = agg.getParam('field'); let tz = agg.getParam('time_zone'); diff --git a/src/legacy/ui/public/agg_types/buckets/filters.ts b/src/legacy/ui/public/agg_types/buckets/filters.ts index f0450f220f610..44a97abb7a1d7 100644 --- a/src/legacy/ui/public/agg_types/buckets/filters.ts +++ b/src/legacy/ui/public/agg_types/buckets/filters.ts @@ -21,7 +21,6 @@ import _ from 'lodash'; import angular from 'angular'; import { i18n } from '@kbn/i18n'; -import { Storage } from 'ui/storage'; import chrome from 'ui/chrome'; import { buildEsQuery } from '@kbn/es-query'; @@ -29,6 +28,7 @@ import { FiltersParamEditor, FilterValue } from '../../vis/editors/default/contr import { createFilterFilters } from './create_filter/filters'; import { BucketAggType, IBucketAggConfig } from './_bucket_agg_type'; import { setup as data } from '../../../../core_plugins/data/public/legacy'; +import { Storage } from '../../../../../plugins/kibana_utils/public'; const { getQueryLog } = data.query.helpers; const config = chrome.getUiSettingsClient(); diff --git a/src/legacy/ui/public/agg_types/buckets/geo_hash.test.ts b/src/legacy/ui/public/agg_types/buckets/geo_hash.test.ts new file mode 100644 index 0000000000000..5c599f16e09c2 --- /dev/null +++ b/src/legacy/ui/public/agg_types/buckets/geo_hash.test.ts @@ -0,0 +1,216 @@ +/* + * 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 { geoHashBucketAgg, IBucketGeoHashGridAggConfig } from './geo_hash'; +import { AggConfigs } from '../agg_configs'; +import { BUCKET_TYPES } from './bucket_agg_types'; + +jest.mock('ui/new_platform'); + +describe('Geohash Agg', () => { + const getAggConfigs = (params?: Record) => { + const indexPattern = { + id: '1234', + title: 'logstash-*', + fields: { + getByName: () => field, + filter: () => [field], + }, + } as any; + + const field = { + name: 'location', + indexPattern, + }; + + return new AggConfigs( + indexPattern, + [ + { + id: BUCKET_TYPES.GEOHASH_GRID, + type: BUCKET_TYPES.GEOHASH_GRID, + schema: 'segment', + params: { + field: { + name: 'location', + }, + isFilteredByCollar: true, + useGeocentroid: true, + mapZoom: 10, + mapBounds: { + top_left: { lat: 1.0, lon: -1.0 }, + bottom_right: { lat: -1.0, lon: 1.0 }, + }, + ...params, + }, + }, + ], + null + ); + }; + + describe('precision parameter', () => { + const PRECISION_PARAM_INDEX = 2; + + let precisionParam: any; + + beforeEach(() => { + precisionParam = geoHashBucketAgg.params[PRECISION_PARAM_INDEX]; + }); + + it('should select precision parameter', () => { + expect(precisionParam.name).toEqual('precision'); + }); + + describe('precision parameter write', () => { + const zoomToGeoHashPrecision: Record = { + 0: 1, + 1: 2, + 2: 2, + 3: 2, + 4: 3, + 5: 3, + 6: 4, + 7: 4, + 8: 4, + 9: 5, + 10: 5, + 11: 6, + 12: 6, + 13: 6, + 14: 7, + 15: 7, + 16: 8, + 17: 8, + 18: 8, + 19: 9, + 20: 9, + 21: 10, + }; + + Object.keys(zoomToGeoHashPrecision).forEach((zoomLevel: string) => { + it(`zoom level ${zoomLevel} should correspond to correct geohash-precision`, () => { + const aggConfigs = getAggConfigs({ + autoPrecision: true, + mapZoom: zoomLevel, + }); + + const { [BUCKET_TYPES.GEOHASH_GRID]: params } = aggConfigs.aggs[0].toDsl(); + + expect(params.precision).toEqual(zoomToGeoHashPrecision[zoomLevel]); + }); + }); + }); + }); + + describe('getRequestAggs', () => { + describe('initial aggregation creation', () => { + let aggConfigs: AggConfigs; + let geoHashGridAgg: IBucketGeoHashGridAggConfig; + + beforeEach(() => { + aggConfigs = getAggConfigs(); + geoHashGridAgg = aggConfigs.aggs[0] as IBucketGeoHashGridAggConfig; + }); + + it('should create filter, geohash_grid, and geo_centroid aggregations', () => { + const requestAggs = geoHashBucketAgg.getRequestAggs( + geoHashGridAgg + ) as IBucketGeoHashGridAggConfig[]; + + expect(requestAggs.length).toEqual(3); + expect(requestAggs[0].type.name).toEqual('filter'); + expect(requestAggs[1].type.name).toEqual('geohash_grid'); + expect(requestAggs[2].type.name).toEqual('geo_centroid'); + }); + + it('should set mapCollar in vis session state', () => { + const [, geoHashAgg] = geoHashBucketAgg.getRequestAggs( + geoHashGridAgg + ) as IBucketGeoHashGridAggConfig[]; + + expect(geoHashAgg).toHaveProperty('lastMapCollar'); + expect(geoHashAgg.lastMapCollar).toHaveProperty('top_left'); + expect(geoHashAgg.lastMapCollar).toHaveProperty('bottom_right'); + expect(geoHashAgg.lastMapCollar).toHaveProperty('zoom'); + }); + }); + }); + + describe('aggregation options', () => { + it('should only create geohash_grid and geo_centroid aggregations when isFilteredByCollar is false', () => { + const aggConfigs = getAggConfigs({ isFilteredByCollar: false }); + const requestAggs = geoHashBucketAgg.getRequestAggs(aggConfigs + .aggs[0] as IBucketGeoHashGridAggConfig) as IBucketGeoHashGridAggConfig[]; + + expect(requestAggs.length).toEqual(2); + expect(requestAggs[0].type.name).toEqual('geohash_grid'); + expect(requestAggs[1].type.name).toEqual('geo_centroid'); + }); + + it('should only create filter and geohash_grid aggregations when useGeocentroid is false', () => { + const aggConfigs = getAggConfigs({ useGeocentroid: false }); + const requestAggs = geoHashBucketAgg.getRequestAggs(aggConfigs + .aggs[0] as IBucketGeoHashGridAggConfig) as IBucketGeoHashGridAggConfig[]; + + expect(requestAggs.length).toEqual(2); + expect(requestAggs[0].type.name).toEqual('filter'); + expect(requestAggs[1].type.name).toEqual('geohash_grid'); + }); + }); + + describe('aggregation creation after map interaction', () => { + let originalRequestAggs: IBucketGeoHashGridAggConfig[]; + + beforeEach(() => { + originalRequestAggs = geoHashBucketAgg.getRequestAggs(getAggConfigs() + .aggs[0] as IBucketGeoHashGridAggConfig) as IBucketGeoHashGridAggConfig[]; + }); + + it('should change geo_bounding_box filter aggregation and vis session state when map movement is outside map collar', () => { + const [, geoBoxingBox] = geoHashBucketAgg.getRequestAggs(getAggConfigs({ + mapBounds: { + top_left: { lat: 10.0, lon: -10.0 }, + bottom_right: { lat: 9.0, lon: -9.0 }, + }, + }).aggs[0] as IBucketGeoHashGridAggConfig) as IBucketGeoHashGridAggConfig[]; + + expect(originalRequestAggs[1].params).not.toEqual(geoBoxingBox.params); + }); + + it('should not change geo_bounding_box filter aggregation and vis session state when map movement is within map collar', () => { + const [, geoBoxingBox] = geoHashBucketAgg.getRequestAggs(getAggConfigs({ + mapBounds: { + top_left: { lat: 1, lon: -1 }, + bottom_right: { lat: -1, lon: 1 }, + }, + }).aggs[0] as IBucketGeoHashGridAggConfig) as IBucketGeoHashGridAggConfig[]; + + expect(originalRequestAggs[1].params).toEqual(geoBoxingBox.params); + }); + + it('should change geo_bounding_box filter aggregation and vis session state when map zoom level changes', () => { + const [, geoBoxingBox] = geoHashBucketAgg.getRequestAggs(getAggConfigs({ + mapZoom: -1, + }).aggs[0] as IBucketGeoHashGridAggConfig) as IBucketGeoHashGridAggConfig[]; + + expect(originalRequestAggs[1].lastMapCollar).not.toEqual(geoBoxingBox.lastMapCollar); + }); + }); +}); diff --git a/src/legacy/ui/public/agg_types/buckets/geo_hash.ts b/src/legacy/ui/public/agg_types/buckets/geo_hash.ts index 555aa94b636b8..1716891231b83 100644 --- a/src/legacy/ui/public/agg_types/buckets/geo_hash.ts +++ b/src/legacy/ui/public/agg_types/buckets/geo_hash.ts @@ -26,7 +26,6 @@ import { IsFilteredByCollarParamEditor } from '../../vis/editors/default/control import { PrecisionParamEditor } from '../../vis/editors/default/controls/precision'; import { geohashColumns } from '../../utils/decode_geo_hash'; import { AggGroupNames } from '../../vis/editors/default/agg_groups'; -import { AggConfig } from '../agg_config'; import { KBN_FIELD_TYPES } from '../../../../../plugins/data/common'; // @ts-ignore @@ -143,7 +142,7 @@ export const geoHashBucketAgg = new BucketAggType({ }, ], getRequestAggs(agg) { - const aggs: AggConfig[] = []; + const aggs: IBucketAggConfig[] = []; const params = agg.params; if (params.isFilteredByCollar && agg.getField()) { diff --git a/src/legacy/ui/public/agg_types/buckets/histogram.test.ts b/src/legacy/ui/public/agg_types/buckets/histogram.test.ts new file mode 100644 index 0000000000000..338af2e41cb88 --- /dev/null +++ b/src/legacy/ui/public/agg_types/buckets/histogram.test.ts @@ -0,0 +1,292 @@ +/* + * 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 { npStart } from 'ui/new_platform'; +import { AggConfigs } from '../index'; +import { BUCKET_TYPES } from './bucket_agg_types'; +import { IBucketHistogramAggConfig, histogramBucketAgg, AutoBounds } from './histogram'; +import { BucketAggType } from './_bucket_agg_type'; + +jest.mock('ui/new_platform'); + +describe('Histogram Agg', () => { + const getAggConfigs = (params: Record = {}) => { + const indexPattern = { + id: '1234', + title: 'logstash-*', + fields: { + getByName: () => field, + filter: () => [field], + }, + } as any; + + const field = { + name: 'field', + indexPattern, + }; + + return new AggConfigs( + indexPattern, + [ + { + field: { + name: 'field', + }, + id: 'test', + type: BUCKET_TYPES.HISTOGRAM, + schema: 'segment', + params, + }, + ], + null + ); + }; + + const getParams = (options: Record) => { + const aggConfigs = getAggConfigs({ + ...options, + field: { + name: 'field', + }, + }); + return aggConfigs.aggs[0].toDsl()[BUCKET_TYPES.HISTOGRAM]; + }; + + describe('ordered', () => { + let histogramType: BucketAggType; + + beforeEach(() => { + histogramType = histogramBucketAgg; + }); + + it('is ordered', () => { + expect(histogramType.ordered).toBeDefined(); + }); + + it('is not ordered by date', () => { + expect(histogramType.ordered).not.toHaveProperty('date'); + }); + }); + + describe('params', () => { + describe('intervalBase', () => { + it('should not be written to the DSL', () => { + const aggConfigs = getAggConfigs({ + intervalBase: 100, + field: { + name: 'field', + }, + }); + const { [BUCKET_TYPES.HISTOGRAM]: params } = aggConfigs.aggs[0].toDsl(); + + expect(params).not.toHaveProperty('intervalBase'); + }); + }); + + describe('interval', () => { + it('accepts a whole number', () => { + const params = getParams({ + interval: 100, + }); + + expect(params).toHaveProperty('interval', 100); + }); + + it('accepts a decimal number', function() { + const params = getParams({ + interval: 0.1, + }); + + expect(params).toHaveProperty('interval', 0.1); + }); + + it('accepts a decimal number string', function() { + const params = getParams({ + interval: '0.1', + }); + + expect(params).toHaveProperty('interval', 0.1); + }); + + it('accepts a whole number string', function() { + const params = getParams({ + interval: '10', + }); + + expect(params).toHaveProperty('interval', 10); + }); + + it('fails on non-numeric values', function() { + const params = getParams({ + interval: [], + }); + + expect(params.interval).toBeNaN(); + }); + + describe('interval scaling', () => { + const getInterval = ( + maxBars: number, + params?: Record, + autoBounds?: AutoBounds + ) => { + const aggConfigs = getAggConfigs({ + ...params, + field: { + name: 'field', + }, + }); + const aggConfig = aggConfigs.aggs[0] as IBucketHistogramAggConfig; + + if (autoBounds) { + aggConfig.setAutoBounds(autoBounds); + } + + // mock histogram:maxBars value; + npStart.core.uiSettings.get = jest.fn(() => maxBars); + + return aggConfig.write(aggConfigs).params; + }; + + it('will respect the histogram:maxBars setting', () => { + const params = getInterval( + 5, + { interval: 5 }, + { + min: 0, + max: 10000, + } + ); + + expect(params).toHaveProperty('interval', 2000); + }); + + it('will return specified interval, if bars are below histogram:maxBars config', () => { + const params = getInterval(100, { interval: 5 }); + + expect(params).toHaveProperty('interval', 5); + }); + + it('will set to intervalBase if interval is below base', () => { + const params = getInterval(1000, { interval: 3, intervalBase: 8 }); + + expect(params).toHaveProperty('interval', 8); + }); + + it('will round to nearest intervalBase multiple if interval is above base', () => { + const roundUp = getInterval(1000, { interval: 46, intervalBase: 10 }); + expect(roundUp).toHaveProperty('interval', 50); + + const roundDown = getInterval(1000, { interval: 43, intervalBase: 10 }); + expect(roundDown).toHaveProperty('interval', 40); + }); + + it('will not change interval if it is a multiple of base', () => { + const output = getInterval(1000, { interval: 35, intervalBase: 5 }); + + expect(output).toHaveProperty('interval', 35); + }); + + it('will round to intervalBase after scaling histogram:maxBars', () => { + const output = getInterval(100, { interval: 5, intervalBase: 6 }, { min: 0, max: 1000 }); + + // 100 buckets in 0 to 1000 would result in an interval of 10, so we should + // round to the next multiple of 6 -> 12 + expect(output).toHaveProperty('interval', 12); + }); + }); + + describe('min_doc_count', () => { + let output: Record; + + it('casts true values to 0', () => { + output = getParams({ min_doc_count: true }); + expect(output).toHaveProperty('min_doc_count', 0); + + output = getParams({ min_doc_count: 'yes' }); + expect(output).toHaveProperty('min_doc_count', 0); + + output = getParams({ min_doc_count: 1 }); + expect(output).toHaveProperty('min_doc_count', 0); + + output = getParams({ min_doc_count: {} }); + expect(output).toHaveProperty('min_doc_count', 0); + }); + + it('writes 1 for falsy values', () => { + output = getParams({ min_doc_count: '' }); + expect(output).toHaveProperty('min_doc_count', 1); + + output = getParams({ min_doc_count: null }); + expect(output).toHaveProperty('min_doc_count', 1); + + output = getParams({ min_doc_count: undefined }); + expect(output).toHaveProperty('min_doc_count', 1); + }); + }); + + describe('extended_bounds', function() { + it('does not write when only eb.min is set', function() { + const output = getParams({ + has_extended_bounds: true, + extended_bounds: { min: 0 }, + }); + expect(output).not.toHaveProperty('extended_bounds'); + }); + + it('does not write when only eb.max is set', function() { + const output = getParams({ + has_extended_bounds: true, + extended_bounds: { max: 0 }, + }); + + expect(output).not.toHaveProperty('extended_bounds'); + }); + + it('writes when both eb.min and eb.max are set', function() { + const output = getParams({ + has_extended_bounds: true, + extended_bounds: { min: 99, max: 100 }, + }); + + expect(output.extended_bounds).toHaveProperty('min', 99); + expect(output.extended_bounds).toHaveProperty('max', 100); + }); + + it('does not write when nothing is set', function() { + const output = getParams({ + has_extended_bounds: true, + extended_bounds: {}, + }); + + expect(output).not.toHaveProperty('extended_bounds'); + }); + + it('does not write when has_extended_bounds is false', function() { + const output = getParams({ + has_extended_bounds: false, + extended_bounds: { min: 99, max: 100 }, + }); + + expect(output).not.toHaveProperty('extended_bounds'); + }); + }); + }); + }); +}); diff --git a/src/legacy/ui/public/agg_types/buckets/histogram.ts b/src/legacy/ui/public/agg_types/buckets/histogram.ts index 23edefc67d506..fba2f47010c34 100644 --- a/src/legacy/ui/public/agg_types/buckets/histogram.ts +++ b/src/legacy/ui/public/agg_types/buckets/histogram.ts @@ -21,18 +21,17 @@ import _ from 'lodash'; import { i18n } from '@kbn/i18n'; import { toastNotifications } from 'ui/notify'; -import chrome from '../../chrome'; +import { npStart } from 'ui/new_platform'; import { BucketAggType, IBucketAggConfig, BucketAggParam } from './_bucket_agg_type'; import { createFilterHistogram } from './create_filter/histogram'; import { NumberIntervalParamEditor } from '../../vis/editors/default/controls/number_interval'; import { MinDocCountParamEditor } from '../../vis/editors/default/controls/min_doc_count'; import { HasExtendedBoundsParamEditor } from '../../vis/editors/default/controls/has_extended_bounds'; import { ExtendedBoundsParamEditor } from '../../vis/editors/default/controls/extended_bounds'; -import { AggConfig } from '../agg_config'; import { KBN_FIELD_TYPES } from '../../../../../plugins/data/common'; import { BUCKET_TYPES } from './bucket_agg_types'; -interface AutoBounds { +export interface AutoBounds { min: number; max: number; } @@ -42,7 +41,8 @@ export interface IBucketHistogramAggConfig extends IBucketAggConfig { getAutoBounds: () => AutoBounds; } -const config = chrome.getUiSettingsClient(); +const getUIConfig = () => npStart.core.uiSettings; + export const histogramBucketAgg = new BucketAggType({ name: BUCKET_TYPES.HISTOGRAM, title: i18n.translate('common.ui.aggTypes.buckets.histogramTitle', { @@ -135,25 +135,30 @@ export const histogramBucketAgg = new BucketAggType({ if (interval <= 0) { interval = 1; } + const autoBounds = aggConfig.getAutoBounds(); // ensure interval does not create too many buckets and crash browser - if (aggConfig.getAutoBounds()) { - const range = aggConfig.getAutoBounds().max - aggConfig.getAutoBounds().min; + if (autoBounds) { + const range = autoBounds.max - autoBounds.min; const bars = range / interval; + + const config = getUIConfig(); if (bars > config.get('histogram:maxBars')) { const minInterval = range / config.get('histogram:maxBars'); + // Round interval by order of magnitude to provide clean intervals // Always round interval up so there will always be less buckets than histogram:maxBars const orderOfMagnitude = Math.pow(10, Math.floor(Math.log10(minInterval))); let roundInterval = orderOfMagnitude; + while (roundInterval < minInterval) { roundInterval += orderOfMagnitude; } interval = roundInterval; } } - const base = aggConfig.params.intervalBase; + if (base) { if (interval < base) { // In case the specified interval is below the base, just increase it to it's base @@ -171,7 +176,7 @@ export const histogramBucketAgg = new BucketAggType({ name: 'min_doc_count', default: false, editorComponent: MinDocCountParamEditor, - write(aggConfig: AggConfig, output: Record) { + write(aggConfig: IBucketAggConfig, output: Record) { if (aggConfig.params.min_doc_count) { output.params.min_doc_count = 0; } else { @@ -192,14 +197,14 @@ export const histogramBucketAgg = new BucketAggType({ max: '', }, editorComponent: ExtendedBoundsParamEditor, - write(aggConfig: AggConfig, output: Record) { + write(aggConfig: IBucketAggConfig, output: Record) { const { min, max } = aggConfig.params.extended_bounds; if (aggConfig.params.has_extended_bounds && (min || min === 0) && (max || max === 0)) { output.params.extended_bounds = { min, max }; } }, - shouldShow: (aggConfig: AggConfig) => aggConfig.params.has_extended_bounds, + shouldShow: (aggConfig: IBucketAggConfig) => aggConfig.params.has_extended_bounds, }, ], }); diff --git a/src/legacy/ui/public/agg_types/buckets/migrate_include_exclude_format.ts b/src/legacy/ui/public/agg_types/buckets/migrate_include_exclude_format.ts index 2bf0930d37684..e4527ff87f48c 100644 --- a/src/legacy/ui/public/agg_types/buckets/migrate_include_exclude_format.ts +++ b/src/legacy/ui/public/agg_types/buckets/migrate_include_exclude_format.ts @@ -18,7 +18,6 @@ */ import { isString, isObject } from 'lodash'; -import { AggConfig } from 'ui/agg_types'; import { IBucketAggConfig, BucketAggType, BucketAggParam } from './_bucket_agg_type'; export const isType = (type: string) => { @@ -32,12 +31,16 @@ export const isType = (type: string) => { export const isStringType = isType('string'); export const migrateIncludeExcludeFormat = { - serialize(this: BucketAggParam, value: any, agg: AggConfig) { + serialize(this: BucketAggParam, value: any, agg: IBucketAggConfig) { if (this.shouldShow && !this.shouldShow(agg)) return; if (!value || isString(value)) return value; else return value.pattern; }, - write(this: BucketAggType, aggConfig: AggConfig, output: Record) { + write( + this: BucketAggType, + aggConfig: IBucketAggConfig, + output: Record + ) { const value = aggConfig.getParam(this.name); if (isObject(value)) { diff --git a/src/legacy/ui/public/agg_types/buckets/range.test.ts b/src/legacy/ui/public/agg_types/buckets/range.test.ts new file mode 100644 index 0000000000000..f7cae60cce773 --- /dev/null +++ b/src/legacy/ui/public/agg_types/buckets/range.test.ts @@ -0,0 +1,95 @@ +/* + * 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 { AggConfigs } from '../agg_configs'; +import { BUCKET_TYPES } from './bucket_agg_types'; +import { NumberFormat } from '../../../../../plugins/data/common/'; + +jest.mock('ui/new_platform'); + +const buckets = [ + { + to: 1024, + to_as_string: '1024.0', + doc_count: 20904, + }, + { + from: 1024, + from_as_string: '1024.0', + to: 2560, + to_as_string: '2560.0', + doc_count: 23358, + }, + { + from: 2560, + from_as_string: '2560.0', + doc_count: 174250, + }, +]; + +describe('Range Agg', () => { + const getAggConfigs = () => { + const field = { + name: 'bytes', + format: new NumberFormat( + { + pattern: '0,0.[000] b', + }, + () => {} + ), + }; + + const indexPattern = { + id: '1234', + title: 'logstash-*', + fields: { + getByName: () => field, + filter: () => [field], + }, + } as any; + + return new AggConfigs( + indexPattern, + [ + { + type: BUCKET_TYPES.RANGE, + schema: 'segment', + params: { + field: 'bytes', + ranges: [{ from: 0, to: 1000 }, { from: 1000, to: 2000 }], + }, + }, + ], + null + ); + }; + + describe('formating', () => { + it('formats bucket keys properly', () => { + const aggConfigs = getAggConfigs(); + const agg = aggConfigs.aggs[0]; + + const format = (val: any) => agg.fieldFormatter()(agg.getKey(val)); + + expect(format(buckets[0])).toBe('≥ -∞ and < 1 KB'); + expect(format(buckets[1])).toBe('≥ 1 KB and < 2.5 KB'); + expect(format(buckets[2])).toBe('≥ 2.5 KB and < +∞'); + }); + }); +}); diff --git a/src/legacy/ui/public/agg_types/buckets/significant_terms.test.ts b/src/legacy/ui/public/agg_types/buckets/significant_terms.test.ts new file mode 100644 index 0000000000000..454f1bf70a790 --- /dev/null +++ b/src/legacy/ui/public/agg_types/buckets/significant_terms.test.ts @@ -0,0 +1,110 @@ +/* + * 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 { AggConfigs } from '../index'; +import { BUCKET_TYPES } from './bucket_agg_types'; +import { significantTermsBucketAgg } from './significant_terms'; + +jest.mock('ui/new_platform'); + +describe('Significant Terms Agg', () => { + describe('order agg editor UI', () => { + describe('convert include/exclude from old format', () => { + const getAggConfigs = (params: Record = {}) => { + const indexPattern = { + id: '1234', + title: 'logstash-*', + fields: { + getByName: () => field, + filter: () => [field], + }, + } as any; + + const field = { + name: 'field', + indexPattern, + }; + + return new AggConfigs( + indexPattern, + [ + { + id: 'test', + type: BUCKET_TYPES.SIGNIFICANT_TERMS, + schema: 'segment', + params, + }, + ], + null + ); + }; + + const testSerializeAndWrite = (aggs: AggConfigs) => { + const agg = aggs.aggs[0]; + const { [BUCKET_TYPES.SIGNIFICANT_TERMS]: params } = agg.toDsl(); + + expect(params.field).toBe('field'); + expect(params.include).toBe('404'); + expect(params.exclude).toBe('400'); + }; + + it('should generate correct label', () => { + const aggConfigs = getAggConfigs({ + size: 'SIZE', + field: { + name: 'FIELD', + }, + }); + const label = significantTermsBucketAgg.makeLabel(aggConfigs.aggs[0]); + + expect(label).toBe('Top SIZE unusual terms in FIELD'); + }); + + it('should doesnt do anything with string type', () => { + const aggConfigs = getAggConfigs({ + include: '404', + exclude: '400', + field: { + name: 'field', + type: 'string', + }, + }); + + testSerializeAndWrite(aggConfigs); + }); + + it('should converts object to string type', () => { + const aggConfigs = getAggConfigs({ + include: { + pattern: '404', + }, + exclude: { + pattern: '400', + }, + field: { + name: 'field', + type: 'string', + }, + }); + + testSerializeAndWrite(aggConfigs); + }); + }); + }); +}); diff --git a/src/legacy/ui/public/agg_types/buckets/terms.test.ts b/src/legacy/ui/public/agg_types/buckets/terms.test.ts new file mode 100644 index 0000000000000..24ac332ae4d55 --- /dev/null +++ b/src/legacy/ui/public/agg_types/buckets/terms.test.ts @@ -0,0 +1,78 @@ +/* + * 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 { AggConfigs } from '../index'; +import { BUCKET_TYPES } from './bucket_agg_types'; + +jest.mock('ui/new_platform'); + +describe('Terms Agg', () => { + describe('order agg editor UI', () => { + const getAggConfigs = (params: Record = {}) => { + const indexPattern = { + id: '1234', + title: 'logstash-*', + fields: { + getByName: () => field, + filter: () => [field], + }, + } as any; + + const field = { + name: 'field', + indexPattern, + }; + + return new AggConfigs( + indexPattern, + [ + { + id: 'test', + params, + type: BUCKET_TYPES.TERMS, + }, + ], + null + ); + }; + + it('converts object to string type', function() { + const aggConfigs = getAggConfigs({ + include: { + pattern: '404', + }, + exclude: { + pattern: '400', + }, + field: { + name: 'field', + }, + orderAgg: { + type: 'count', + }, + }); + + const { [BUCKET_TYPES.TERMS]: params } = aggConfigs.aggs[0].toDsl(); + + expect(params.field).toBe('field'); + expect(params.include).toBe('404'); + expect(params.exclude).toBe('400'); + }); + }); +}); diff --git a/src/legacy/ui/public/agg_types/filter/prop_filter.test.ts b/src/legacy/ui/public/agg_types/filter/prop_filter.test.ts index 0d32c9dc769da..431e1161e0dbd 100644 --- a/src/legacy/ui/public/agg_types/filter/prop_filter.test.ts +++ b/src/legacy/ui/public/agg_types/filter/prop_filter.test.ts @@ -27,7 +27,7 @@ describe('prop filter', () => { nameFilter = propFilter('name'); }); - function getObjects(...names: string[]) { + const getObjects = (...names: string[]) => { const count = new Map(); const objects = []; @@ -41,8 +41,9 @@ describe('prop filter', () => { }); count.set(name, count.get(name) + 1); } + return objects; - } + }; it('returns list when no filters are provided', () => { const objects = getObjects('table', 'table', 'pie'); diff --git a/src/legacy/ui/public/agg_types/metrics/lib/make_nested_label.test.ts b/src/legacy/ui/public/agg_types/metrics/lib/make_nested_label.test.ts index aed5bd630d3d2..479ff40b7c0ae 100644 --- a/src/legacy/ui/public/agg_types/metrics/lib/make_nested_label.test.ts +++ b/src/legacy/ui/public/agg_types/metrics/lib/make_nested_label.test.ts @@ -18,7 +18,7 @@ */ import { makeNestedLabel } from './make_nested_label'; -import { IMetricAggConfig } from 'ui/agg_types/metrics/metric_agg_type'; +import { IMetricAggConfig } from '../metric_agg_type'; describe('metric agg make_nested_label', () => { const generateAggConfig = (metricLabel: string): IMetricAggConfig => { diff --git a/src/legacy/ui/public/agg_types/metrics/parent_pipeline.test.ts b/src/legacy/ui/public/agg_types/metrics/parent_pipeline.test.ts index bf88adcee92b7..7c7a2a68cd7c5 100644 --- a/src/legacy/ui/public/agg_types/metrics/parent_pipeline.test.ts +++ b/src/legacy/ui/public/agg_types/metrics/parent_pipeline.test.ts @@ -22,8 +22,8 @@ import { derivativeMetricAgg } from './derivative'; import { cumulativeSumMetricAgg } from './cumulative_sum'; import { movingAvgMetricAgg } from './moving_avg'; import { serialDiffMetricAgg } from './serial_diff'; -import { AggConfigs } from 'ui/agg_types'; -import { IMetricAggConfig, MetricAggType } from 'ui/agg_types/metrics/metric_agg_type'; +import { AggConfigs } from '../agg_configs'; +import { IMetricAggConfig, MetricAggType } from './metric_agg_type'; jest.mock('../../vis/editors/default/schemas', () => { class MockedSchemas { diff --git a/src/legacy/ui/public/agg_types/metrics/sibling_pipeline.test.ts b/src/legacy/ui/public/agg_types/metrics/sibling_pipeline.test.ts index a3381aca6f9e7..e038936de07d2 100644 --- a/src/legacy/ui/public/agg_types/metrics/sibling_pipeline.test.ts +++ b/src/legacy/ui/public/agg_types/metrics/sibling_pipeline.test.ts @@ -23,8 +23,8 @@ import { bucketAvgMetricAgg } from './bucket_avg'; import { bucketMinMetricAgg } from './bucket_min'; import { bucketMaxMetricAgg } from './bucket_max'; -import { AggConfigs } from 'ui/agg_types'; -import { IMetricAggConfig, MetricAggType } from 'ui/agg_types/metrics/metric_agg_type'; +import { AggConfigs } from '../agg_configs'; +import { IMetricAggConfig, MetricAggType } from './metric_agg_type'; jest.mock('../../vis/editors/default/schemas', () => { class MockedSchemas { diff --git a/src/legacy/ui/public/agg_types/metrics/std_deviation.test.ts b/src/legacy/ui/public/agg_types/metrics/std_deviation.test.ts index ca81e8daee449..ae09b5cd78977 100644 --- a/src/legacy/ui/public/agg_types/metrics/std_deviation.test.ts +++ b/src/legacy/ui/public/agg_types/metrics/std_deviation.test.ts @@ -18,8 +18,8 @@ */ import { IStdDevAggConfig, stdDeviationMetricAgg } from './std_deviation'; -import { AggConfigs } from 'ui/agg_types'; -import { METRIC_TYPES } from 'ui/agg_types/metrics/metric_agg_types'; +import { AggConfigs } from '../agg_configs'; +import { METRIC_TYPES } from './metric_agg_types'; jest.mock('ui/new_platform'); diff --git a/src/legacy/ui/public/agg_types/metrics/top_hit.test.ts b/src/legacy/ui/public/agg_types/metrics/top_hit.test.ts index 4ed6fcdcf641b..e9d1ebb93d3ba 100644 --- a/src/legacy/ui/public/agg_types/metrics/top_hit.test.ts +++ b/src/legacy/ui/public/agg_types/metrics/top_hit.test.ts @@ -19,8 +19,8 @@ import { dropRight, last } from 'lodash'; import { topHitMetricAgg } from './top_hit'; -import { AggConfigs } from 'ui/agg_types'; -import { IMetricAggConfig } from 'ui/agg_types/metrics/metric_agg_type'; +import { AggConfigs } from '../agg_configs'; +import { IMetricAggConfig } from './metric_agg_type'; import { KBN_FIELD_TYPES } from '../../../../../plugins/data/common'; jest.mock('ui/new_platform'); diff --git a/src/legacy/ui/public/agg_types/param_types/json.test.ts b/src/legacy/ui/public/agg_types/param_types/json.test.ts index fb31385505a76..827299814c62a 100644 --- a/src/legacy/ui/public/agg_types/param_types/json.test.ts +++ b/src/legacy/ui/public/agg_types/param_types/json.test.ts @@ -19,7 +19,7 @@ import { BaseParamType } from './base'; import { JsonParamType } from './json'; -import { AggConfig } from 'ui/agg_types'; +import { AggConfig } from '../agg_config'; jest.mock('ui/new_platform'); @@ -28,13 +28,12 @@ describe('JSON', function() { let aggConfig: AggConfig; let output: Record; - function initAggParam(config: Record = {}) { - return new JsonParamType({ + const initAggParam = (config: Record = {}) => + new JsonParamType({ ...config, type: 'json', name: paramName, }); - } beforeEach(function() { aggConfig = { params: {} } as AggConfig; diff --git a/src/legacy/ui/public/agg_types/param_types/string.test.ts b/src/legacy/ui/public/agg_types/param_types/string.test.ts index 3d496ecf898e4..fd5ccebde993e 100644 --- a/src/legacy/ui/public/agg_types/param_types/string.test.ts +++ b/src/legacy/ui/public/agg_types/param_types/string.test.ts @@ -19,7 +19,7 @@ import { BaseParamType } from './base'; import { StringParamType } from './string'; -import { AggConfig } from 'ui/agg_types'; +import { AggConfig } from '../agg_config'; jest.mock('ui/new_platform'); @@ -28,13 +28,12 @@ describe('String', function() { let aggConfig: AggConfig; let output: Record; - function initAggParam(config: Record = {}) { - return new StringParamType({ + const initAggParam = (config: Record = {}) => + new StringParamType({ ...config, type: 'string', name: paramName, }); - } beforeEach(() => { aggConfig = { params: {} } as AggConfig; diff --git a/src/legacy/ui/public/agg_types/utils.ts b/src/legacy/ui/public/agg_types/utils.ts index c6452cf46e0c0..6721262d265f4 100644 --- a/src/legacy/ui/public/agg_types/utils.ts +++ b/src/legacy/ui/public/agg_types/utils.ts @@ -49,7 +49,7 @@ function isValidJson(value: string): boolean { } } -function isValidInterval(value: string, baseInterval: string) { +function isValidInterval(value: string, baseInterval?: string) { if (baseInterval) { return _parseWithBase(value, baseInterval); } else { diff --git a/src/legacy/ui/public/autoload/modules.js b/src/legacy/ui/public/autoload/modules.js index d662d479fc86b..e1d897236297e 100644 --- a/src/legacy/ui/public/autoload/modules.js +++ b/src/legacy/ui/public/autoload/modules.js @@ -27,7 +27,6 @@ import '../promises'; import '../modals'; import '../state_management/app_state'; import '../state_management/global_state'; -import '../storage'; import '../style_compile'; import '../url'; import '../directives/watch_multi'; diff --git a/src/legacy/ui/public/capabilities/react/inject_ui_capabilities.test.tsx b/src/legacy/ui/public/capabilities/react/inject_ui_capabilities.test.tsx index dccea2f61d567..ff46b6ec34a86 100644 --- a/src/legacy/ui/public/capabilities/react/inject_ui_capabilities.test.tsx +++ b/src/legacy/ui/public/capabilities/react/inject_ui_capabilities.test.tsx @@ -77,6 +77,7 @@ describe('injectUICapabilities', () => { uiCapabilities: UICapabilities; } + // eslint-disable-next-line react/prefer-stateless-function class MyClassComponent extends React.Component { public render() { return {this.props.uiCapabilities.uiCapability2.nestedProp}; diff --git a/src/legacy/ui/public/capabilities/react/legacy/inject_ui_capabilities.test.tsx b/src/legacy/ui/public/capabilities/react/legacy/inject_ui_capabilities.test.tsx index 21f96cf918afd..76f1dd8016313 100644 --- a/src/legacy/ui/public/capabilities/react/legacy/inject_ui_capabilities.test.tsx +++ b/src/legacy/ui/public/capabilities/react/legacy/inject_ui_capabilities.test.tsx @@ -77,6 +77,7 @@ describe('injectUICapabilities', () => { uiCapabilities: UICapabilities; } + // eslint-disable-next-line react/prefer-stateless-function class MyClassComponent extends React.Component { public render() { return {this.props.uiCapabilities.uiCapability2.nestedProp}; diff --git a/src/legacy/ui/public/capabilities/react/ui_capabilities_provider.tsx b/src/legacy/ui/public/capabilities/react/ui_capabilities_provider.tsx index fb6a1dc55c29f..3871147107439 100644 --- a/src/legacy/ui/public/capabilities/react/ui_capabilities_provider.tsx +++ b/src/legacy/ui/public/capabilities/react/ui_capabilities_provider.tsx @@ -17,22 +17,14 @@ * under the License. */ -import React, { ReactNode } from 'react'; +import React from 'react'; import { UICapabilitiesContext } from './ui_capabilities_context'; import { capabilities } from '..'; -interface Props { - children: ReactNode; -} +export const UICapabilitiesProvider: React.SFC = props => ( + + {props.children} + +); -export class UICapabilitiesProvider extends React.Component { - public static displayName: string = 'UICapabilitiesProvider'; - - public render() { - return ( - - {this.props.children} - - ); - } -} +UICapabilitiesProvider.displayName = 'UICapabilitiesProvider'; diff --git a/src/legacy/ui/public/chrome/chrome.js b/src/legacy/ui/public/chrome/chrome.js index a5a0521013a6e..d644965e09225 100644 --- a/src/legacy/ui/public/chrome/chrome.js +++ b/src/legacy/ui/public/chrome/chrome.js @@ -26,7 +26,7 @@ import '../config'; import '../notify'; import '../private'; import '../promises'; -import '../storage'; +import '../directives/storage'; import '../directives/watch_multi'; import './services'; import '../react_components'; diff --git a/src/legacy/ui/public/chrome/directives/kbn_chrome.html b/src/legacy/ui/public/chrome/directives/kbn_chrome.html index 541082e68de58..7738093fe9dea 100644 --- a/src/legacy/ui/public/chrome/directives/kbn_chrome.html +++ b/src/legacy/ui/public/chrome/directives/kbn_chrome.html @@ -1,4 +1,4 @@ -
+
{ const newPlatform = npStart.core; const legacyMetadata = newPlatform.injectedMetadata.getLegacyMetadata(); @@ -187,6 +194,9 @@ const $setupBreadcrumbsAutoClear = (newPlatform: CoreStart) => ( }); $rootScope.$on('$routeChangeSuccess', () => { + if (isDummyWrapperRoute($route)) { + return; + } const current = $route.current || {}; if (breadcrumbSetSinceRouteChange || (current.$$route && current.$$route.redirectTo)) { @@ -226,6 +236,9 @@ const $setupBadgeAutoClear = (newPlatform: CoreStart) => ( }); $rootScope.$on('$routeChangeSuccess', () => { + if (isDummyWrapperRoute($route)) { + return; + } const current = $route.current || {}; if (badgeSetSinceRouteChange || (current.$$route && current.$$route.redirectTo)) { @@ -270,10 +283,16 @@ const $setupHelpExtensionAutoClear = (newPlatform: CoreStart) => ( const $route = $injector.has('$route') ? $injector.get('$route') : {}; $rootScope.$on('$routeChangeStart', () => { + if (isDummyWrapperRoute($route)) { + return; + } helpExtensionSetSinceRouteChange = false; }); $rootScope.$on('$routeChangeSuccess', () => { + if (isDummyWrapperRoute($route)) { + return; + } const current = $route.current || {}; if (helpExtensionSetSinceRouteChange || (current.$$route && current.$$route.redirectTo)) { @@ -286,10 +305,15 @@ const $setupHelpExtensionAutoClear = (newPlatform: CoreStart) => ( const $setupUrlOverflowHandling = (newPlatform: CoreStart) => ( $location: ILocationService, - $rootScope: IRootScopeService + $rootScope: IRootScopeService, + $injector: auto.IInjectorService ) => { + const $route = $injector.has('$route') ? $injector.get('$route') : {}; const urlOverflow = new UrlOverflowService(); const check = () => { + if (isDummyWrapperRoute($route)) { + return; + } // disable long url checks when storing state in session storage if (newPlatform.uiSettings.get('state:storeInSessionStorage')) { return; diff --git a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js index 20ea9c9141aca..611a182cf5d7f 100644 --- a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js +++ b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js @@ -36,9 +36,17 @@ export const npSetup = { register: () => undefined, get: () => null, }, + getExecutor: () => ({ + interpreter: { + interpretAst: () => {}, + }, + }), }, }, data: { + query: { + filterManager: sinon.fake(), + }, }, inspector: { registerView: () => undefined, @@ -73,6 +81,24 @@ export const npStart = { }, data: { getSuggestions: sinon.fake(), + query: { + filterManager: { + getFetches$: sinon.fake(), + getFilters: sinon.fake(), + getAppFilters: sinon.fake(), + getGlobalFilters: sinon.fake(), + removeFilter: sinon.fake(), + addFilters: sinon.fake(), + setFilters: sinon.fake(), + removeAll: sinon.fake(), + getUpdates$: () => { + return { + subscribe: () => {} + }; + }, + + }, + }, }, inspector: { isAvailable: () => false, diff --git a/src/legacy/ui/public/routes/route_manager.d.ts b/src/legacy/ui/public/routes/route_manager.d.ts index 3471d7e954862..56203354f3c20 100644 --- a/src/legacy/ui/public/routes/route_manager.d.ts +++ b/src/legacy/ui/public/routes/route_manager.d.ts @@ -26,7 +26,10 @@ import { ChromeBreadcrumb } from '../../../../core/public'; interface RouteConfiguration { controller?: string | ((...args: any[]) => void); redirectTo?: string; + resolveRedirectTo?: (...args: any[]) => void; reloadOnSearch?: boolean; + reloadOnUrl?: boolean; + outerAngularWrapperRoute?: boolean; resolve?: object; template?: string; k7Breadcrumbs?: (...args: any[]) => ChromeBreadcrumb[]; diff --git a/src/legacy/ui/public/styles/_legacy/_base.scss b/src/legacy/ui/public/styles/_legacy/_base.scss index aad90a99ac357..0fcfb515c7c90 100644 --- a/src/legacy/ui/public/styles/_legacy/_base.scss +++ b/src/legacy/ui/public/styles/_legacy/_base.scss @@ -4,13 +4,14 @@ input.ng-invalid, textarea.ng-invalid, select.ng-invalid { - &.ng-dirty, &.ng-touched { + &.ng-dirty, + &.ng-touched { border-color: $euiColorDanger !important; } } -input[type="radio"], -input[type="checkbox"], +input[type='radio'], +input[type='checkbox'], .radio, .radio-inline, .checkbox, @@ -18,7 +19,7 @@ input[type="checkbox"], &[disabled], fieldset[disabled] & { cursor: default; - opacity: .8; + opacity: 0.8; } } @@ -27,7 +28,7 @@ input[type="checkbox"], align-items: center; padding-left: 0 !important; - input[type="checkbox"] { + input[type='checkbox'] { float: none; margin: 0 $euiSizeXS; position: static; @@ -95,7 +96,6 @@ input[type="checkbox"], } } - // Too overused in many places to be moved elsewhere .page-row { @@ -114,7 +114,7 @@ input[type="checkbox"], // state. This is useful when you've already hand crafted your own // focus states in Kibana. :focus { - &:not([class^="eui"]):not(.kbn-resetFocusState) { + &:not([class^='eui']):not(.kbn-resetFocusState) { @include euiFocusRing; } } @@ -122,7 +122,8 @@ input[type="checkbox"], // A neccessary hack so that the above focus policy doesn't polute some EUI // entrenched inputs. .euiComboBox { - input:focus { + // :not() specificity needed to override the above + input:not([class^='eui']):focus { animation: none !important; } } diff --git a/src/legacy/ui/public/vis/default_feedback_message.js b/src/legacy/ui/public/vis/default_feedback_message.js index f840ba961b9c3..8b8491d397aad 100644 --- a/src/legacy/ui/public/vis/default_feedback_message.js +++ b/src/legacy/ui/public/vis/default_feedback_message.js @@ -19,9 +19,10 @@ 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' } - } -); +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/legacy/ui/public/vis/editors/default/components/agg.test.tsx b/src/legacy/ui/public/vis/editors/default/components/agg.test.tsx index 5dfb14156deee..7806b1c0f78fb 100644 --- a/src/legacy/ui/public/vis/editors/default/components/agg.test.tsx +++ b/src/legacy/ui/public/vis/editors/default/components/agg.test.tsx @@ -156,7 +156,7 @@ describe('DefaultEditorAgg component', () => { it('should add schema component', () => { defaultProps.agg.schema = { - editorComponent: () =>
, + editorComponent: () =>
, } as any; const comp = mount(); diff --git a/src/legacy/ui/public/vis/editors/default/components/agg_group.tsx b/src/legacy/ui/public/vis/editors/default/components/agg_group.tsx index 6d3b5fc4e6355..528914f4fd006 100644 --- a/src/legacy/ui/public/vis/editors/default/components/agg_group.tsx +++ b/src/legacy/ui/public/vis/editors/default/components/agg_group.tsx @@ -26,7 +26,9 @@ import { EuiDraggable, EuiSpacer, EuiPanel, + EuiFormErrorText, } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; import { AggConfig } from '../../../../agg_types/agg_config'; import { aggGroupNamesMap, AggGroupNames } from '../agg_groups'; @@ -80,7 +82,15 @@ function DefaultEditorAggGroup({ const [aggsState, setAggsState] = useReducer(aggGroupReducer, group, initAggsState); - const isGroupValid = Object.values(aggsState).every(item => item.valid); + const bucketsError = + lastParentPipelineAggTitle && groupName === AggGroupNames.Buckets && !group.length + ? i18n.translate('common.ui.aggTypes.buckets.mustHaveBucketErrorMessage', { + defaultMessage: 'Add a bucket with "Date Histogram" or "Histogram" aggregation.', + description: 'Date Histogram and Histogram should not be translated', + }) + : undefined; + + const isGroupValid = !bucketsError && Object.values(aggsState).every(item => item.valid); const isAllAggsTouched = isInvalidAggsTouched(aggsState); const isMetricAggregationDisabled = useMemo( () => groupName === AggGroupNames.Metrics && getEnabledMetricAggsCount(group) === 1, @@ -144,6 +154,12 @@ function DefaultEditorAggGroup({

{groupNameLabel}

+ {bucketsError && ( + <> + {bucketsError} + + + )} <> {group.map((agg: AggConfig, index: number) => ( diff --git a/src/legacy/ui/public/vis/editors/default/controls/filter.tsx b/src/legacy/ui/public/vis/editors/default/controls/filter.tsx index 2c0a2b6be37f8..4ebe7b0d835d7 100644 --- a/src/legacy/ui/public/vis/editors/default/controls/filter.tsx +++ b/src/legacy/ui/public/vis/editors/default/controls/filter.tsx @@ -23,7 +23,7 @@ import { i18n } from '@kbn/i18n'; import { Query, QueryBarInput } from 'plugins/data'; import { AggConfig } from '../../..'; import { npStart } from '../../../../new_platform'; -import { Storage } from '../../../../storage'; +import { Storage } from '../../../../../../../plugins/kibana_utils/public'; import { KibanaContextProvider } from '../../../../../../../plugins/kibana_react/public'; const localStorage = new Storage(window.localStorage); @@ -94,7 +94,7 @@ function FilterRow({ { @@ -66,7 +67,7 @@ const defaultEditor = function ($rootScope, $compile) { //$scope.$apply(); }; - return new Promise(resolve => { + return new Promise(async (resolve) => { if (!this.$scope) { this.$scope = $scope = $rootScope.$new(); @@ -157,23 +158,21 @@ const defaultEditor = function ($rootScope, $compile) { if (!this._handler) { const visualizationEl = this.el.find('.visEditor__canvas')[0]; - getVisualizeLoader().then(loader => { - if (!visualizationEl) { - return; - } - this._loader = loader; - this._handler = this._loader.embedVisualizationWithSavedObject(visualizationEl, this.savedObj, { - uiState: uiState, - listenOnChange: false, - timeRange: timeRange, - filters: filters, - appState: appState, - }); + + this._handler = await embeddables.getEmbeddableFactory('visualization').createFromObject(this.savedObj, { + uiState: uiState, + appState: getAppState(), + timeRange: timeRange, + filters: filters || [], + query: query, }); + this._handler.render(visualizationEl); + } else { - this._handler.update({ + this._handler.updateInput({ timeRange: timeRange, - filters: filters, + filters: filters || [], + query: query, }); } diff --git a/src/legacy/ui/public/vis/vis_filters/brush_event.js b/src/legacy/ui/public/vis/vis_filters/brush_event.js index 90cbaf7c048ee..17ab302a20cb1 100644 --- a/src/legacy/ui/public/vis/vis_filters/brush_event.js +++ b/src/legacy/ui/public/vis/vis_filters/brush_event.js @@ -19,7 +19,7 @@ import _ from 'lodash'; import moment from 'moment'; -import { buildRangeFilter } from '@kbn/es-query'; +import { esFilters } from '../../../../../plugins/data/public'; export function onBrushEvent(event) { const isNumber = event.data.ordered; @@ -56,7 +56,7 @@ export function onBrushEvent(event) { }; } - const newFilter = buildRangeFilter( + const newFilter = esFilters.buildRangeFilter( field, range, indexPattern, diff --git a/src/legacy/ui/public/vis/vis_filters/vis_filters.js b/src/legacy/ui/public/vis/vis_filters/vis_filters.js index f19e2440a21e9..e879d040125f1 100644 --- a/src/legacy/ui/public/vis/vis_filters/vis_filters.js +++ b/src/legacy/ui/public/vis/vis_filters/vis_filters.js @@ -20,8 +20,8 @@ import _ from 'lodash'; import { pushFilterBarFilters } from '../push_filters'; import { onBrushEvent } from './brush_event'; -import { uniqFilters } from '../../../../core_plugins/data/public'; -import { toggleFilterNegated } from '@kbn/es-query'; +import { uniqFilters, esFilters } from '../../../../../plugins/data/public'; + /** * For terms aggregations on `__other__` buckets, this assembles a list of applicable filter * terms based on a specific cell in the tabified data. @@ -94,7 +94,7 @@ const createFiltersFromEvent = (event) => { if (filter) { filter.forEach(f => { if (event.negate) { - f = toggleFilterNegated(f); + f = esFilters.toggleFilterNegated(f); } filters.push(f); }); diff --git a/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts b/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts index bc2152911d1ec..fb16e095b3418 100644 --- a/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts +++ b/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts @@ -22,13 +22,13 @@ import { debounce, forEach, get, isEqual } from 'lodash'; import * as Rx from 'rxjs'; import { share } from 'rxjs/operators'; import { i18n } from '@kbn/i18n'; -import { Filter } from '@kbn/es-query'; import { toastNotifications } from 'ui/notify'; // @ts-ignore untyped dependency import { AggConfigs } from 'ui/agg_types/agg_configs'; import { SearchSource } from 'ui/courier'; import { QueryFilter } from 'ui/filter_manager/query_filter'; -import { TimeRange } from 'src/plugins/data/public'; + +import { TimeRange, onlyDisabledFiltersChanged } from '../../../../../plugins/data/public'; import { registries } from '../../../../core_plugins/interpreter/public/registries'; import { Inspector } from '../../inspector'; import { Adapters } from '../../inspector/types'; @@ -42,7 +42,8 @@ import { Vis } from '../../vis'; import { VisFiltersProvider } from '../../vis/vis_filters'; import { PipelineDataLoader } from './pipeline_data_loader'; import { visualizationLoader } from './visualization_loader'; -import { onlyDisabledFiltersChanged, Query } from '../../../../core_plugins/data/public'; +import { Query } from '../../../../core_plugins/data/public'; +import { esFilters } from '../../../../../plugins/data/public'; import { DataAdapter, RequestAdapter } from '../../inspector/adapters'; @@ -66,7 +67,7 @@ export interface RequestHandlerParams { aggs: AggConfigs; timeRange?: TimeRange; query?: Query; - filters?: Filter[]; + filters?: esFilters.Filter[]; forceFetch: boolean; queryFilter: QueryFilter; uiState?: PersistedState; @@ -537,16 +538,16 @@ export class EmbeddedVisualizeHandler { private rendererProvider = (response: VisResponseData | null) => { const renderer = registries.renderers.get(get(response || {}, 'as', 'visualization')); - const args = [ - this.element, - get(response, 'value', { visType: this.vis.type.name }), - this.handlers, - ]; if (!renderer) { return null; } - return () => renderer.render(...args); + return () => + renderer.render( + this.element, + get(response, 'value', { visType: this.vis.type.name }), + this.handlers + ); }; } diff --git a/src/legacy/ui/public/visualize/loader/pipeline_helpers/build_pipeline.ts b/src/legacy/ui/public/visualize/loader/pipeline_helpers/build_pipeline.ts index 17ec224f4c7de..21b13abea440e 100644 --- a/src/legacy/ui/public/visualize/loader/pipeline_helpers/build_pipeline.ts +++ b/src/legacy/ui/public/visualize/loader/pipeline_helpers/build_pipeline.ts @@ -24,7 +24,7 @@ import { SearchSource } from 'ui/courier'; import { AggConfig, Vis, VisParams, VisState } from 'ui/vis'; import { isDateHistogramBucketAggConfig } from 'ui/agg_types/buckets/date_histogram'; import moment from 'moment'; -import { SerializedFieldFormat } from 'src/plugins/expressions/common/expressions/types/common'; +import { SerializedFieldFormat } from 'src/plugins/expressions/public'; import { createFormat } from './utilities'; interface SchemaConfigParams { diff --git a/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts b/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts index c12bd222663ae..c5ebc75973d0c 100644 --- a/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts +++ b/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts @@ -20,7 +20,7 @@ import { i18n } from '@kbn/i18n'; import { identity } from 'lodash'; import { AggConfig, Vis } from 'ui/vis'; -import { SerializedFieldFormat } from 'src/plugins/expressions/common/expressions/types/common'; +import { SerializedFieldFormat } from 'src/plugins/expressions/public'; import { FieldFormat } from '../../../../../../plugins/data/common/field_formats'; diff --git a/src/legacy/ui/public/visualize/loader/types.ts b/src/legacy/ui/public/visualize/loader/types.ts index 87183d839e637..525ec35834ecd 100644 --- a/src/legacy/ui/public/visualize/loader/types.ts +++ b/src/legacy/ui/public/visualize/loader/types.ts @@ -17,7 +17,6 @@ * under the License. */ -import { Filter } from '@kbn/es-query'; import { TimeRange } from 'src/plugins/data/public'; import { Query } from 'src/legacy/core_plugins/data/public'; import { SavedObject } from 'ui/saved_objects/saved_object'; @@ -26,6 +25,7 @@ import { SearchSource } from '../../courier'; import { PersistedState } from '../../persisted_state'; import { AppState } from '../../state_management/app_state'; import { Vis } from '../../vis'; +import { esFilters } from '../../../../../plugins/data/public'; export interface VisSavedObject extends SavedObject { vis: Vis; @@ -68,7 +68,7 @@ export interface VisualizeLoaderParams { /** * Specifies the filters that should be applied to that visualization. */ - filters?: Filter[]; + filters?: esFilters.Filter[]; /** * The query that should apply to that visualization. */ diff --git a/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts b/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts index ec612f7dd0373..9f3aa190917d7 100644 --- a/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts +++ b/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts @@ -22,13 +22,13 @@ import { get } from 'lodash'; import { toastNotifications } from 'ui/notify'; import { AggConfig } from 'ui/vis'; -import { Filter } from '@kbn/es-query'; import { Query } from 'src/legacy/core_plugins/data/public'; import { timefilter } from 'ui/timefilter'; import { Vis } from '../../../vis'; +import { esFilters } from '../../../../../../plugins/data/public'; interface QueryGeohashBoundsParams { - filters?: Filter[]; + filters?: esFilters.Filter[]; query?: Query; } @@ -76,7 +76,7 @@ export async function queryGeohashBounds(vis: Vis, params: QueryGeohashBoundsPar const useTimeFilter = !!indexPattern.timeFieldName; if (useTimeFilter) { const filter = timefilter.createFilter(indexPattern); - if (filter) activeFilters.push((filter as any) as Filter); + if (filter) activeFilters.push((filter as any) as esFilters.Filter); } return activeFilters; }); diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/kibana.json b/src/plugins/dashboard_embeddable_container/kibana.json similarity index 90% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/kibana.json rename to src/plugins/dashboard_embeddable_container/kibana.json index 417168ba61dd9..aab23316f606c 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/kibana.json +++ b/src/plugins/dashboard_embeddable_container/kibana.json @@ -4,7 +4,7 @@ "requiredPlugins": [ "embeddable", "inspector", - "ui_actions" + "uiActions" ], "server": false, "ui": true diff --git a/src/plugins/dashboard_embeddable_container/public/_index.scss b/src/plugins/dashboard_embeddable_container/public/_index.scss new file mode 100644 index 0000000000000..ccb8299072fb7 --- /dev/null +++ b/src/plugins/dashboard_embeddable_container/public/_index.scss @@ -0,0 +1,5 @@ +@import '../../embeddable/public/variables'; + +@import './embeddable/grid/index'; +@import './embeddable/panel/index'; +@import './embeddable/viewport/index'; diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.test.tsx b/src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.test.tsx similarity index 97% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.test.tsx rename to src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.test.tsx index 0fa34817bee86..f8c05170e8f67 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.test.tsx +++ b/src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.test.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { isErrorEmbeddable, EmbeddableFactory } from '../embeddable_api'; +import { isErrorEmbeddable, EmbeddableFactory } from '../embeddable_plugin'; import { ExpandPanelAction } from './expand_panel_action'; import { DashboardContainer } from '../embeddable'; import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers'; @@ -27,7 +27,7 @@ import { ContactCardEmbeddable, ContactCardEmbeddableInput, ContactCardEmbeddableOutput, -} from '../../../../../../embeddable_api/public/np_ready/public/lib/test_samples'; +} from '../embeddable_plugin_test_samples'; import { DashboardOptions } from '../embeddable/dashboard_container_factory'; const embeddableFactories = new Map(); diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.tsx b/src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.tsx similarity index 93% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.tsx rename to src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.tsx index f05d0b0efc2ee..68f68f8a53bcc 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.tsx +++ b/src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.tsx @@ -18,12 +18,9 @@ */ import { i18n } from '@kbn/i18n'; -import { IEmbeddable } from '../../../../../../embeddable_api/public/np_ready/public'; +import { IEmbeddable } from '../embeddable_plugin'; +import { IAction, IncompatibleActionError } from '../ui_actions_plugin'; import { DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '../embeddable'; -import { - IAction, - IncompatibleActionError, -} from '../../../../../../../../../src/plugins/ui_actions/public'; export const EXPAND_PANEL_ACTION = 'togglePanel'; diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/index.ts b/src/plugins/dashboard_embeddable_container/public/actions/index.ts similarity index 100% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/index.ts rename to src/plugins/dashboard_embeddable_container/public/actions/index.ts diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/open_replace_panel_flyout.tsx b/src/plugins/dashboard_embeddable_container/public/actions/open_replace_panel_flyout.tsx similarity index 78% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/open_replace_panel_flyout.tsx rename to src/plugins/dashboard_embeddable_container/public/actions/open_replace_panel_flyout.tsx index b6652caf3ab83..cb354375e7a68 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/open_replace_panel_flyout.tsx +++ b/src/plugins/dashboard_embeddable_container/public/actions/open_replace_panel_flyout.tsx @@ -17,26 +17,32 @@ * under the License. */ import React from 'react'; -import { CoreStart } from 'src/core/public'; +import { CoreStart } from '../../../../core/public'; import { ReplacePanelFlyout } from './replace_panel_flyout'; - import { IEmbeddable, EmbeddableInput, EmbeddableOutput, -} from '../../../../../../embeddable_api/public/np_ready/public'; - -import { IContainer } from '../../../../../../embeddable_api/public/np_ready/public'; -import { NotificationsStart } from '../../../../../../../../core/public'; + Start as EmbeddableStart, + IContainer, +} from '../embeddable_plugin'; export async function openReplacePanelFlyout(options: { embeddable: IContainer; core: CoreStart; savedObjectFinder: React.ComponentType; - notifications: NotificationsStart; + notifications: CoreStart['notifications']; panelToRemove: IEmbeddable; + getEmbeddableFactories: EmbeddableStart['getEmbeddableFactories']; }) { - const { embeddable, core, panelToRemove, savedObjectFinder, notifications } = options; + const { + embeddable, + core, + panelToRemove, + savedObjectFinder, + notifications, + getEmbeddableFactories, + } = options; const flyoutSession = core.overlays.openFlyout( , { 'data-test-subj': 'replacePanelFlyout', diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_action.test.tsx b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.test.tsx similarity index 83% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_action.test.tsx rename to src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.test.tsx index e1d2e3609570c..de29e1dec85a8 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_action.test.tsx +++ b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.test.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { isErrorEmbeddable, EmbeddableFactory } from '../embeddable_api'; +import { isErrorEmbeddable, EmbeddableFactory } from '../embeddable_plugin'; import { ReplacePanelAction } from './replace_panel_action'; import { DashboardContainer } from '../embeddable'; import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers'; @@ -27,7 +27,7 @@ import { ContactCardEmbeddable, ContactCardEmbeddableInput, ContactCardEmbeddableOutput, -} from '../../../../../../embeddable_api/public/np_ready/public/lib/test_samples'; +} from '../embeddable_plugin_test_samples'; import { DashboardOptions } from '../embeddable/dashboard_container_factory'; const embeddableFactories = new Map(); @@ -35,6 +35,7 @@ embeddableFactories.set( CONTACT_CARD_EMBEDDABLE, new ContactCardEmbeddableFactory({} as any, (() => null) as any, {} as any) ); +const getEmbeddableFactories = () => embeddableFactories.values(); let container: DashboardContainer; let embeddable: ContactCardEmbeddable; @@ -82,7 +83,12 @@ test('Executes the replace panel action', async () => { let core: any; let SavedObjectFinder: any; let notifications: any; - const action = new ReplacePanelAction(core, SavedObjectFinder, notifications); + const action = new ReplacePanelAction( + core, + SavedObjectFinder, + notifications, + getEmbeddableFactories + ); action.execute({ embeddable }); }); @@ -90,7 +96,12 @@ test('Is not compatible when embeddable is not in a dashboard container', async let core: any; let SavedObjectFinder: any; let notifications: any; - const action = new ReplacePanelAction(core, SavedObjectFinder, notifications); + const action = new ReplacePanelAction( + core, + SavedObjectFinder, + notifications, + getEmbeddableFactories + ); expect( await action.isCompatible({ embeddable: new ContactCardEmbeddable( @@ -105,7 +116,12 @@ test('Execute throws an error when called with an embeddable not in a parent', a let core: any; let SavedObjectFinder: any; let notifications: any; - const action = new ReplacePanelAction(core, SavedObjectFinder, notifications); + const action = new ReplacePanelAction( + core, + SavedObjectFinder, + notifications, + getEmbeddableFactories + ); async function check() { await action.execute({ embeddable: container }); } @@ -116,7 +132,12 @@ test('Returns title', async () => { let core: any; let SavedObjectFinder: any; let notifications: any; - const action = new ReplacePanelAction(core, SavedObjectFinder, notifications); + const action = new ReplacePanelAction( + core, + SavedObjectFinder, + notifications, + getEmbeddableFactories + ); expect(action.getDisplayName({ embeddable })).toBeDefined(); }); @@ -124,6 +145,11 @@ test('Returns an icon', async () => { let core: any; let SavedObjectFinder: any; let notifications: any; - const action = new ReplacePanelAction(core, SavedObjectFinder, notifications); + const action = new ReplacePanelAction( + core, + SavedObjectFinder, + notifications, + getEmbeddableFactories + ); expect(action.getIconType({ embeddable })).toBeDefined(); }); diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_action.tsx b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.tsx similarity index 87% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_action.tsx rename to src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.tsx index f36efc498b15f..f6d2fcbcd57fd 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_action.tsx +++ b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.tsx @@ -18,15 +18,10 @@ */ import { i18n } from '@kbn/i18n'; -import { CoreStart } from 'src/core/public'; - -import { IEmbeddable, ViewMode } from '../../../../../../embeddable_api/public/np_ready/public'; +import { CoreStart } from '../../../../core/public'; +import { IEmbeddable, ViewMode, Start as EmbeddableStart } from '../embeddable_plugin'; import { DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '../embeddable'; -import { - IAction, - IncompatibleActionError, -} from '../../../../../../../../plugins/ui_actions/public'; -import { NotificationsStart } from '../../../../../../../../core/public'; +import { IAction, IncompatibleActionError } from '../ui_actions_plugin'; import { openReplacePanelFlyout } from './open_replace_panel_flyout'; export const REPLACE_PANEL_ACTION = 'replacePanel'; @@ -47,7 +42,8 @@ export class ReplacePanelAction implements IAction { constructor( private core: CoreStart, private savedobjectfinder: React.ComponentType, - private notifications: NotificationsStart + private notifications: CoreStart['notifications'], + private getEmbeddableFactories: EmbeddableStart['getEmbeddableFactories'] ) {} public getDisplayName({ embeddable }: ActionContext) { @@ -89,6 +85,7 @@ export class ReplacePanelAction implements IAction { savedObjectFinder: this.savedobjectfinder, notifications: this.notifications, panelToRemove: view, + getEmbeddableFactories: this.getEmbeddableFactories, }); } } diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_flyout.tsx b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_flyout.tsx similarity index 90% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_flyout.tsx rename to src/plugins/dashboard_embeddable_container/public/actions/replace_panel_flyout.tsx index 0e738556372ce..02e5f45fae3bd 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_flyout.tsx +++ b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_flyout.tsx @@ -19,10 +19,6 @@ import { i18n } from '@kbn/i18n'; import React from 'react'; - -import { NotificationsStart } from 'src/core/public'; -import { DashboardPanelState } from 'src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public'; - import { EuiFlyout, EuiFlyoutBody, @@ -30,15 +26,15 @@ import { EuiTitle, EuiGlobalToastListToast as Toast, } from '@elastic/eui'; - -import { IContainer } from '../../../../../../embeddable_api/public/np_ready/public'; +import { DashboardPanelState } from '../embeddable'; +import { NotificationsStart } from '../../../../core/public'; import { + IContainer, IEmbeddable, EmbeddableInput, EmbeddableOutput, -} from '../../../../../../embeddable_api/public/np_ready/public'; - -import { start } from '../../../../../../embeddable_api/public/np_ready/public/legacy'; + Start as EmbeddableStart, +} from '../embeddable_plugin'; interface Props { container: IContainer; @@ -46,6 +42,7 @@ interface Props { onClose: () => void; notifications: NotificationsStart; panelToRemove: IEmbeddable; + getEmbeddableFactories: EmbeddableStart['getEmbeddableFactories']; } export class ReplacePanelFlyout extends React.Component { @@ -117,7 +114,7 @@ export class ReplacePanelFlyout extends React.Component { defaultMessage: 'No matching objects found.', } )} - savedObjectMetaData={[...start.getEmbeddableFactories()] + savedObjectMetaData={[...this.props.getEmbeddableFactories()] .filter( embeddableFactory => Boolean(embeddableFactory.savedObjectMetaData) && !embeddableFactory.isContainerType diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_constants.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_constants.ts similarity index 94% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_constants.ts rename to src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_constants.ts index 941ddd3c5efec..34cd8d42a1188 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_constants.ts +++ b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_constants.ts @@ -21,3 +21,4 @@ export const DASHBOARD_GRID_COLUMN_COUNT = 48; export const DASHBOARD_GRID_HEIGHT = 20; export const DEFAULT_PANEL_WIDTH = DASHBOARD_GRID_COLUMN_COUNT / 2; export const DEFAULT_PANEL_HEIGHT = 15; +export const DASHBOARD_CONTAINER_TYPE = 'dashboard'; diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.test.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.test.tsx similarity index 97% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.test.tsx rename to src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.test.tsx index 06bc696b95193..770c46c62e42f 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.test.tsx +++ b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.test.tsx @@ -20,7 +20,7 @@ // @ts-ignore import { findTestSubject } from '@elastic/eui/lib/test'; import { nextTick } from 'test_utils/enzyme_helpers'; -import { isErrorEmbeddable, ViewMode, EmbeddableFactory } from '../embeddable_api'; +import { isErrorEmbeddable, ViewMode, EmbeddableFactory } from '../embeddable_plugin'; import { DashboardContainer, DashboardContainerOptions } from './dashboard_container'; import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers'; import { @@ -29,7 +29,7 @@ import { ContactCardEmbeddableInput, ContactCardEmbeddable, ContactCardEmbeddableOutput, -} from '../../../../../../embeddable_api/public/np_ready/public/lib/test_samples'; +} from '../embeddable_plugin_test_samples'; const options: DashboardContainerOptions = { application: {} as any, diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.tsx similarity index 83% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.tsx rename to src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.tsx index 919995f544960..8b258f3558438 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.tsx +++ b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.tsx @@ -20,9 +20,9 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { I18nProvider } from '@kbn/i18n/react'; -import { Filter } from '@kbn/es-query'; -import { RefreshInterval, TimeRange } from 'src/plugins/data/public'; -import { IUiActionsStart } from '../../../../../../../../plugins/ui_actions/public'; +import { RefreshInterval, TimeRange, Query } from '../../../data/public'; +import { CoreStart } from '../../../../core/public'; +import { IUiActionsStart } from '../ui_actions_plugin'; import { Container, ContainerInput, @@ -30,24 +30,23 @@ import { ViewMode, EmbeddableFactory, IEmbeddable, -} from '../../../../../../embeddable_api/public/np_ready/public'; -import { DASHBOARD_CONTAINER_TYPE } from './dashboard_container_factory'; + Start as EmbeddableStartContract, +} from '../embeddable_plugin'; +import { DASHBOARD_CONTAINER_TYPE } from './dashboard_constants'; import { createPanelState } from './panel'; import { DashboardPanelState } from './types'; import { DashboardViewport } from './viewport/dashboard_viewport'; -import { Query } from '../../../../../../data/public'; -import { CoreStart } from '../../../../../../../../core/public'; -import { Start as InspectorStartContract } from '../../../../../../../../plugins/inspector/public'; -import { Start as EmbeddableStartContract } from '../../../../../../embeddable_api/public/np_ready/public'; +import { Start as InspectorStartContract } from '../../../inspector/public'; +import { esFilters } from '../../../../plugins/data/public'; import { + KibanaContextProvider, KibanaReactContext, KibanaReactContextValue, - KibanaContextProvider, -} from '../../../../../../../../plugins/kibana_react/public'; +} from '../../../kibana_react/public'; export interface DashboardContainerInput extends ContainerInput { viewMode: ViewMode; - filters: Filter[]; + filters: esFilters.Filter[]; query: Query; timeRange: TimeRange; refreshConfig?: RefreshInterval; @@ -66,7 +65,7 @@ interface IndexSignature { } export interface InheritedChildInput extends IndexSignature { - filters: Filter[]; + filters: esFilters.Filter[]; query: Query; timeRange: TimeRange; refreshConfig?: RefreshInterval; diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container_factory.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container_factory.tsx similarity index 91% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container_factory.ts rename to src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container_factory.tsx index 29ce9bcb0da2e..c8a2837fd77d0 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container_factory.ts +++ b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container_factory.tsx @@ -18,17 +18,21 @@ */ import { i18n } from '@kbn/i18n'; -import { SavedObjectAttributes } from '../../../../../../../../core/server'; +import { SavedObjectAttributes } from '../../../../core/public'; import { SavedObjectMetaData } from '../types'; -import { ContainerOutput, EmbeddableFactory, ErrorEmbeddable, Container } from '../embeddable_api'; +import { + ContainerOutput, + EmbeddableFactory, + ErrorEmbeddable, + Container, +} from '../embeddable_plugin'; import { DashboardContainer, DashboardContainerInput, DashboardContainerOptions, } from './dashboard_container'; import { DashboardCapabilities } from '../types'; - -export const DASHBOARD_CONTAINER_TYPE = 'dashboard'; +import { DASHBOARD_CONTAINER_TYPE } from './dashboard_constants'; export interface DashboardOptions extends DashboardContainerOptions { savedObjectMetaData?: SavedObjectMetaData; diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/_dashboard_grid.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/_dashboard_grid.scss similarity index 100% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/_dashboard_grid.scss rename to src/plugins/dashboard_embeddable_container/public/embeddable/grid/_dashboard_grid.scss diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/_index.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/_index.scss similarity index 100% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/_index.scss rename to src/plugins/dashboard_embeddable_container/public/embeddable/grid/_index.scss diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.test.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.test.tsx similarity index 96% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.test.tsx rename to src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.test.tsx index 386aae9ddcf78..e4338dc89153d 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.test.tsx +++ b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.test.tsx @@ -23,15 +23,15 @@ import sizeMe from 'react-sizeme'; import React from 'react'; import { nextTick, mountWithIntl } from 'test_utils/enzyme_helpers'; import { skip } from 'rxjs/operators'; -import { EmbeddableFactory, GetEmbeddableFactory } from '../../embeddable_api'; +import { EmbeddableFactory, GetEmbeddableFactory } from '../../embeddable_plugin'; import { DashboardGrid, DashboardGridProps } from './dashboard_grid'; import { DashboardContainer, DashboardContainerOptions } from '../dashboard_container'; import { getSampleDashboardInput } from '../../test_helpers'; import { CONTACT_CARD_EMBEDDABLE, ContactCardEmbeddableFactory, -} from '../../../../../../../embeddable_api/public/np_ready/public/lib/test_samples'; -import { KibanaContextProvider } from '../../../../../../../../../plugins/kibana_react/public'; +} from '../../embeddable_plugin_test_samples'; +import { KibanaContextProvider } from '../../../../kibana_react/public'; let dashboardContainer: DashboardContainer | undefined; diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.tsx similarity index 95% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.tsx rename to src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.tsx index 291bef15641f3..40db43427339d 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.tsx +++ b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.tsx @@ -20,19 +20,21 @@ import 'react-grid-layout/css/styles.css'; import 'react-resizable/css/styles.css'; +// @ts-ignore +import sizeMe from 'react-sizeme'; + import { injectI18n } from '@kbn/i18n/react'; import classNames from 'classnames'; import _ from 'lodash'; import React from 'react'; import { Subscription } from 'rxjs'; import ReactGridLayout, { Layout } from 'react-grid-layout'; -// @ts-ignore -import sizeMe from 'react-sizeme'; -import { ViewMode, EmbeddableChildPanel } from '../../embeddable_api'; +import { ViewMode, EmbeddableChildPanel } from '../../embeddable_plugin'; import { DASHBOARD_GRID_COLUMN_COUNT, DASHBOARD_GRID_HEIGHT } from '../dashboard_constants'; -import { DashboardContainer, DashboardReactContextValue } from '../dashboard_container'; import { DashboardPanelState, GridData } from '../types'; -import { withKibana } from '../../../../../../../../../plugins/kibana_react/public'; +import { withKibana } from '../../../../kibana_react/public'; +import { DashboardContainerInput } from '../dashboard_container'; +import { DashboardContainer, DashboardReactContextValue } from '../dashboard_container'; let lastValidGridSize = 0; @@ -174,16 +176,18 @@ class DashboardGridUi extends React.Component { isLayoutInvalid, }); - this.subscription = this.props.container.getInput$().subscribe(input => { - if (this.mounted) { - this.setState({ - panels: input.panels, - viewMode: input.viewMode, - useMargins: input.useMargins, - expandedPanelId: input.expandedPanelId, - }); - } - }); + this.subscription = this.props.container + .getInput$() + .subscribe((input: DashboardContainerInput) => { + if (this.mounted) { + this.setState({ + panels: input.panels, + viewMode: input.viewMode, + useMargins: input.useMargins, + expandedPanelId: input.expandedPanelId, + }); + } + }); } public componentWillUnmount() { diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/index.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/index.ts similarity index 100% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/index.ts rename to src/plugins/dashboard_embeddable_container/public/embeddable/grid/index.ts diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/index.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/index.ts similarity index 91% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/index.ts rename to src/plugins/dashboard_embeddable_container/public/embeddable/index.ts index 2a6a56e3300bc..58bfd5eedefcb 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/index.ts +++ b/src/plugins/dashboard_embeddable_container/public/embeddable/index.ts @@ -17,7 +17,7 @@ * under the License. */ -export { DASHBOARD_CONTAINER_TYPE, DashboardContainerFactory } from './dashboard_container_factory'; +export { DashboardContainerFactory } from './dashboard_container_factory'; export { DashboardContainer, DashboardContainerInput } from './dashboard_container'; export { createPanelState } from './panel'; @@ -27,4 +27,5 @@ export { DASHBOARD_GRID_COLUMN_COUNT, DEFAULT_PANEL_HEIGHT, DEFAULT_PANEL_WIDTH, + DASHBOARD_CONTAINER_TYPE, } from './dashboard_constants'; diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/_dashboard_panel.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/_dashboard_panel.scss similarity index 100% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/_dashboard_panel.scss rename to src/plugins/dashboard_embeddable_container/public/embeddable/panel/_dashboard_panel.scss diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/_index.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/_index.scss similarity index 100% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/_index.scss rename to src/plugins/dashboard_embeddable_container/public/embeddable/panel/_index.scss diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.test.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.test.ts similarity index 93% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.test.ts rename to src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.test.ts index e66a25831577c..8889f4dc27544 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.test.ts +++ b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.test.ts @@ -20,9 +20,8 @@ import { DEFAULT_PANEL_HEIGHT, DEFAULT_PANEL_WIDTH } from '../dashboard_constants'; import { DashboardPanelState } from '../types'; import { createPanelState } from './create_panel_state'; -import { EmbeddableInput } from '../../embeddable_api'; -// eslint-disable-next-line @kbn/eslint/no-restricted-paths -import { CONTACT_CARD_EMBEDDABLE } from '../../../../../../../embeddable_api/public/np_ready/public/lib/test_samples'; +import { EmbeddableInput } from '../../embeddable_plugin'; +import { CONTACT_CARD_EMBEDDABLE } from '../../embeddable_plugin_test_samples'; interface TestInput extends EmbeddableInput { test: string; diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.ts similarity index 98% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.ts rename to src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.ts index 4f3de4a9b2bfb..7139cddf02b33 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.ts +++ b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.ts @@ -18,7 +18,7 @@ */ import _ from 'lodash'; -import { PanelState, EmbeddableInput } from '../../embeddable_api'; +import { PanelState, EmbeddableInput } from '../../embeddable_plugin'; import { DASHBOARD_GRID_COLUMN_COUNT, DEFAULT_PANEL_HEIGHT, diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/index.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/index.ts similarity index 100% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/index.ts rename to src/plugins/dashboard_embeddable_container/public/embeddable/panel/index.ts diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/types.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/types.ts similarity index 94% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/types.ts rename to src/plugins/dashboard_embeddable_container/public/embeddable/types.ts index 6e5257f0d1ee0..480d03552ca68 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/types.ts +++ b/src/plugins/dashboard_embeddable_container/public/embeddable/types.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { PanelState, EmbeddableInput } from '../embeddable_api'; +import { PanelState, EmbeddableInput } from '../embeddable_plugin'; export type PanelId = string; export type SavedObjectId = string; diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/_dashboard_viewport.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/_dashboard_viewport.scss similarity index 100% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/_dashboard_viewport.scss rename to src/plugins/dashboard_embeddable_container/public/embeddable/viewport/_dashboard_viewport.scss diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/_index.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/_index.scss similarity index 100% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/_index.scss rename to src/plugins/dashboard_embeddable_container/public/embeddable/viewport/_index.scss diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.test.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.test.tsx similarity index 95% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.test.tsx rename to src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.test.tsx index 01bde21f91d3b..7b83407bf8063 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.test.tsx +++ b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.test.tsx @@ -24,15 +24,15 @@ import { skip } from 'rxjs/operators'; import { mount } from 'enzyme'; import { I18nProvider } from '@kbn/i18n/react'; import { nextTick } from 'test_utils/enzyme_helpers'; -import { EmbeddableFactory } from '../../embeddable_api'; +import { EmbeddableFactory } from '../../embeddable_plugin'; import { DashboardViewport, DashboardViewportProps } from './dashboard_viewport'; import { DashboardContainer, DashboardContainerOptions } from '../dashboard_container'; import { getSampleDashboardInput } from '../../test_helpers'; import { CONTACT_CARD_EMBEDDABLE, ContactCardEmbeddableFactory, -} from '../../../../../../../embeddable_api/public/np_ready/public/lib/test_samples'; -import { KibanaContextProvider } from '../../../../../../../../../plugins/kibana_react/public'; +} from '../../embeddable_plugin_test_samples'; +import { KibanaContextProvider } from '../../../../../plugins/kibana_react/public'; let dashboardContainer: DashboardContainer | undefined; diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.tsx similarity index 95% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.tsx rename to src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.tsx index 59accb225238b..13407e5e33725 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.tsx +++ b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.tsx @@ -19,10 +19,10 @@ import React from 'react'; import { Subscription } from 'rxjs'; -import { PanelState } from '../../embeddable_api'; +import { PanelState } from '../../embeddable_plugin'; import { DashboardContainer, DashboardReactContextValue } from '../dashboard_container'; import { DashboardGrid } from '../grid'; -import { context } from '../../../../../../../../../plugins/kibana_react/public'; +import { context } from '../../../../kibana_react/public'; export interface DashboardViewportProps { container: DashboardContainer; diff --git a/src/legacy/ui/public/storage/web_storage.ts b/src/plugins/dashboard_embeddable_container/public/embeddable_plugin.ts similarity index 93% rename from src/legacy/ui/public/storage/web_storage.ts rename to src/plugins/dashboard_embeddable_container/public/embeddable_plugin.ts index d5f775431143d..30c0ec4975141 100644 --- a/src/legacy/ui/public/storage/web_storage.ts +++ b/src/plugins/dashboard_embeddable_container/public/embeddable_plugin.ts @@ -17,4 +17,4 @@ * under the License. */ -export type WebStorage = Storage; +export * from '../../../plugins/embeddable/public'; diff --git a/src/plugins/dashboard_embeddable_container/public/embeddable_plugin_test_samples.ts b/src/plugins/dashboard_embeddable_container/public/embeddable_plugin_test_samples.ts new file mode 100644 index 0000000000000..0e49a94278dfc --- /dev/null +++ b/src/plugins/dashboard_embeddable_container/public/embeddable_plugin_test_samples.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. + */ + +// eslint-disable-next-line +export * from '../../../plugins/embeddable/public/lib/test_samples'; diff --git a/src/plugins/dashboard_embeddable_container/public/index.ts b/src/plugins/dashboard_embeddable_container/public/index.ts new file mode 100644 index 0000000000000..73597525105db --- /dev/null +++ b/src/plugins/dashboard_embeddable_container/public/index.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 { PluginInitializerContext } from '../../../core/public'; +import { DashboardEmbeddableContainerPublicPlugin } from './plugin'; + +export * from './types'; +export * from './actions'; +export * from './embeddable'; + +export function plugin(initializerContext: PluginInitializerContext) { + return new DashboardEmbeddableContainerPublicPlugin(initializerContext); +} + +export { DashboardEmbeddableContainerPublicPlugin as Plugin }; diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/plugin.ts b/src/plugins/dashboard_embeddable_container/public/plugin.tsx similarity index 61% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/plugin.ts rename to src/plugins/dashboard_embeddable_container/public/plugin.tsx index bb18d109b0de7..eadf70a36416a 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/plugin.ts +++ b/src/plugins/dashboard_embeddable_container/public/plugin.tsx @@ -17,11 +17,21 @@ * under the License. */ +/* eslint-disable max-classes-per-file */ + +import * as React from 'react'; import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public'; -import { IUiActionsSetup, IUiActionsStart } from '../../../../../../plugins/ui_actions/public'; -import { CONTEXT_MENU_TRIGGER, Plugin as EmbeddablePlugin } from './lib/embeddable_api'; -import { ExpandPanelAction, ReplacePanelAction, DashboardContainerFactory } from './lib'; -import { Start as InspectorStartContract } from '../../../../../../plugins/inspector/public'; +import { IUiActionsSetup, IUiActionsStart } from '../../../plugins/ui_actions/public'; +import { CONTEXT_MENU_TRIGGER, Plugin as EmbeddablePlugin } from './embeddable_plugin'; +import { ExpandPanelAction, ReplacePanelAction } from '.'; +import { DashboardContainerFactory } from './embeddable/dashboard_container_factory'; +import { Start as InspectorStartContract } from '../../../plugins/inspector/public'; +import { + SavedObjectFinder as SavedObjectFinderUi, + SavedObjectFinderProps, + ExitFullScreenButton as ExitFullScreenButtonUi, + ExitFullScreenButtonProps, +} from '../../../plugins/kibana_react/public'; interface SetupDependencies { embeddable: ReturnType; @@ -32,10 +42,6 @@ interface StartDependencies { embeddable: ReturnType; inspector: InspectorStartContract; uiActions: IUiActionsStart; - __LEGACY: { - SavedObjectFinder: React.ComponentType; - ExitFullScreenButton: React.ComponentType; - }; } export type Setup = void; @@ -53,12 +59,35 @@ export class DashboardEmbeddableContainerPublicPlugin public start(core: CoreStart, plugins: StartDependencies): Start { const { application, notifications, overlays } = core; - const { embeddable, inspector, __LEGACY, uiActions } = plugins; + const { embeddable, inspector, uiActions } = plugins; + + const SavedObjectFinder: React.FC< + Exclude + > = props => ( + + ); + + const useHideChrome = () => { + React.useEffect(() => { + core.chrome.setIsVisible(false); + return () => core.chrome.setIsVisible(true); + }, []); + }; + + const ExitFullScreenButton: React.FC = props => { + useHideChrome(); + return ; + }; const changeViewAction = new ReplacePanelAction( core, - __LEGACY.SavedObjectFinder, - notifications + SavedObjectFinder, + notifications, + plugins.embeddable.getEmbeddableFactories ); uiActions.registerAction(changeViewAction); uiActions.attachAction(CONTEXT_MENU_TRIGGER, changeViewAction.id); @@ -69,8 +98,8 @@ export class DashboardEmbeddableContainerPublicPlugin overlays, embeddable, inspector, - SavedObjectFinder: __LEGACY.SavedObjectFinder, - ExitFullScreenButton: __LEGACY.ExitFullScreenButton, + SavedObjectFinder, + ExitFullScreenButton, uiActions, }); diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/test_helpers/get_sample_dashboard_input.ts b/src/plugins/dashboard_embeddable_container/public/test_helpers/get_sample_dashboard_input.ts similarity index 96% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/test_helpers/get_sample_dashboard_input.ts rename to src/plugins/dashboard_embeddable_container/public/test_helpers/get_sample_dashboard_input.ts index 98eb0636f9aad..09478d8e8af35 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/test_helpers/get_sample_dashboard_input.ts +++ b/src/plugins/dashboard_embeddable_container/public/test_helpers/get_sample_dashboard_input.ts @@ -17,7 +17,7 @@ * under the License. */ -import { ViewMode, EmbeddableInput } from '../embeddable_api'; +import { ViewMode, EmbeddableInput } from '../embeddable_plugin'; import { DashboardContainerInput, DashboardPanelState } from '../embeddable'; export function getSampleDashboardInput( diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/test_helpers/index.ts b/src/plugins/dashboard_embeddable_container/public/test_helpers/index.ts similarity index 100% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/test_helpers/index.ts rename to src/plugins/dashboard_embeddable_container/public/test_helpers/index.ts diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/tests/dashboard_container.test.tsx b/src/plugins/dashboard_embeddable_container/public/tests/dashboard_container.test.tsx similarity index 83% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/tests/dashboard_container.test.tsx rename to src/plugins/dashboard_embeddable_container/public/tests/dashboard_container.test.tsx index 6cf409581b76d..6a3b69af60d6b 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/tests/dashboard_container.test.tsx +++ b/src/plugins/dashboard_embeddable_container/public/tests/dashboard_container.test.tsx @@ -23,28 +23,24 @@ import React from 'react'; import { mount } from 'enzyme'; import { nextTick } from 'test_utils/enzyme_helpers'; import { I18nProvider } from '@kbn/i18n/react'; -import { ViewMode, CONTEXT_MENU_TRIGGER, EmbeddablePanel } from '../lib/embeddable_api'; -import { - DashboardContainer, - DashboardContainerOptions, -} from '../lib/embeddable/dashboard_container'; -import { getSampleDashboardInput } from '../lib/test_helpers'; +import { ViewMode, CONTEXT_MENU_TRIGGER, EmbeddablePanel } from '../embeddable_plugin'; +import { DashboardContainer, DashboardContainerOptions } from '../embeddable/dashboard_container'; +import { getSampleDashboardInput } from '../test_helpers'; import { CONTACT_CARD_EMBEDDABLE, ContactCardEmbeddableFactory, -} from '../../../../../embeddable_api/public/np_ready/public/lib/test_samples'; -import { ContactCardEmbeddableInput, ContactCardEmbeddable, ContactCardEmbeddableOutput, -} from '../../../../../embeddable_api/public/np_ready/public/lib/test_samples'; -import { embeddablePluginMock } from '../../../../../embeddable_api/public/np_ready/public/mocks'; -import { createEditModeAction } from '../../../../../embeddable_api/public/np_ready/public/lib/test_samples'; + createEditModeAction, +} from '../embeddable_plugin_test_samples'; +// eslint-disable-next-line +import { embeddablePluginMock } from '../../../embeddable/public/mocks'; // eslint-disable-next-line -import { inspectorPluginMock } from '../../../../../../../plugins/inspector/public/mocks'; -import { KibanaContextProvider } from '../../../../../../../plugins/kibana_react/public'; +import { inspectorPluginMock } from '../../../inspector/public/mocks'; +import { KibanaContextProvider } from '../../../kibana_react/public'; // eslint-disable-next-line -import { uiActionsPluginMock } from 'src/plugins/ui_actions/public/mocks'; +import { uiActionsPluginMock } from '../../../ui_actions/public/mocks'; test('DashboardContainer in edit mode shows edit mode actions', async () => { const inspector = inspectorPluginMock.createStartContract(); diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/types.ts b/src/plugins/dashboard_embeddable_container/public/types.ts similarity index 91% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/types.ts rename to src/plugins/dashboard_embeddable_container/public/types.ts index fe6f4bcdafec9..9c2d6c0ab388d 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/types.ts +++ b/src/plugins/dashboard_embeddable_container/public/types.ts @@ -18,10 +18,7 @@ */ import { IconType } from '@elastic/eui'; -import { - SavedObject as SavedObjectType, - SavedObjectAttributes, -} from '../../../../../../../core/server'; +import { SavedObject as SavedObjectType, SavedObjectAttributes } from '../../../core/public'; export interface DashboardCapabilities { showWriteControls: boolean; @@ -61,6 +58,11 @@ export interface SavedObjectMetaData { showSavedObject?(savedObject: SimpleSavedObject): boolean; } +interface FieldSubType { + multi?: { parent: string }; + nested?: { path: string }; +} + export interface Field { name: string; type: string; @@ -70,6 +72,5 @@ export interface Field { aggregatable: boolean; filterable: boolean; searchable: boolean; - parent?: string; - subType?: string; + subType?: FieldSubType; } diff --git a/src/plugins/dashboard_embeddable_container/public/ui_actions_plugin.ts b/src/plugins/dashboard_embeddable_container/public/ui_actions_plugin.ts new file mode 100644 index 0000000000000..c8778025e7713 --- /dev/null +++ b/src/plugins/dashboard_embeddable_container/public/ui_actions_plugin.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 * from '../../../plugins/ui_actions/public'; diff --git a/src/plugins/data/common/es_query/__tests__/fields_mock.ts b/src/plugins/data/common/es_query/__tests__/fields_mock.ts new file mode 100644 index 0000000000000..83fdf588af00c --- /dev/null +++ b/src/plugins/data/common/es_query/__tests__/fields_mock.ts @@ -0,0 +1,320 @@ +/* + * 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 fields = [ + { + name: 'bytes', + type: 'number', + esTypes: ['long'], + count: 10, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }, + { + name: 'ssl', + type: 'boolean', + esTypes: ['boolean'], + count: 20, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }, + { + name: '@timestamp', + type: 'date', + esTypes: ['date'], + count: 30, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }, + { + name: 'time', + type: 'date', + esTypes: ['date'], + count: 30, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }, + { + name: '@tags', + type: 'string', + esTypes: ['keyword'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }, + { + name: 'utc_time', + type: 'date', + esTypes: ['date'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }, + { + name: 'phpmemory', + type: 'number', + esTypes: ['integer'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }, + { + name: 'ip', + type: 'ip', + esTypes: ['ip'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }, + { + name: 'request_body', + type: 'attachment', + esTypes: ['attachment'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }, + { + name: 'point', + type: 'geo_point', + esTypes: ['geo_point'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }, + { + name: 'area', + type: 'geo_shape', + esTypes: ['geo_shape'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }, + { + name: 'hashed', + type: 'murmur3', + esTypes: ['murmur3'], + count: 0, + scripted: false, + searchable: true, + aggregatable: false, + readFromDocValues: false, + }, + { + name: 'geo.coordinates', + type: 'geo_point', + esTypes: ['geo_point'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }, + { + name: 'extension', + type: 'string', + esTypes: ['keyword'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }, + { + name: 'machine.os', + type: 'string', + esTypes: ['text'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: false, + }, + { + name: 'machine.os.raw', + type: 'string', + esTypes: ['keyword'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + subType: { multi: { parent: 'machine.os' } }, + }, + { + name: 'geo.src', + type: 'string', + esTypes: ['keyword'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }, + { + name: '_id', + type: 'string', + esTypes: ['_id'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: false, + }, + { + name: '_type', + type: 'string', + esTypes: ['_type'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: false, + }, + { + name: '_source', + type: '_source', + esTypes: ['_source'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: false, + }, + { + name: 'non-filterable', + type: 'string', + esTypes: ['text'], + count: 0, + scripted: false, + searchable: false, + aggregatable: true, + readFromDocValues: false, + }, + { + name: 'non-sortable', + type: 'string', + esTypes: ['text'], + count: 0, + scripted: false, + searchable: false, + aggregatable: false, + readFromDocValues: false, + }, + { + name: 'custom_user_field', + type: 'conflict', + esTypes: ['long', 'text'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }, + { + name: 'script string', + type: 'string', + count: 0, + scripted: true, + script: "'i am a string'", + lang: 'expression', + searchable: true, + aggregatable: true, + readFromDocValues: false, + }, + { + name: 'script number', + type: 'number', + count: 0, + scripted: true, + script: '1234', + lang: 'expression', + searchable: true, + aggregatable: true, + readFromDocValues: false, + }, + { + name: 'script date', + type: 'date', + count: 0, + scripted: true, + script: '1234', + lang: 'painless', + searchable: true, + aggregatable: true, + readFromDocValues: false, + }, + { + name: 'script murmur3', + type: 'murmur3', + count: 0, + scripted: true, + script: '1234', + lang: 'expression', + searchable: true, + aggregatable: true, + readFromDocValues: false, + }, + { + name: 'nestedField.child', + type: 'string', + esTypes: ['text'], + count: 0, + scripted: false, + searchable: true, + aggregatable: false, + readFromDocValues: false, + subType: { nested: { path: 'nestedField' } }, + }, + { + name: 'nestedField.nestedChild.doublyNestedChild', + type: 'string', + esTypes: ['text'], + count: 0, + scripted: false, + searchable: true, + aggregatable: false, + readFromDocValues: false, + subType: { nested: { path: 'nestedField.nestedChild' } }, + }, +]; + +export const getField = (name: string) => fields.find(field => field.name === name); diff --git a/packages/kbn-es-query/src/filters/lib/custom_filter.ts b/src/plugins/data/common/es_query/filters/custom_filter.ts similarity index 100% rename from packages/kbn-es-query/src/filters/lib/custom_filter.ts rename to src/plugins/data/common/es_query/filters/custom_filter.ts diff --git a/packages/kbn-es-query/src/filters/lib/exists_filter.ts b/src/plugins/data/common/es_query/filters/exists_filter.ts similarity index 81% rename from packages/kbn-es-query/src/filters/lib/exists_filter.ts rename to src/plugins/data/common/es_query/filters/exists_filter.ts index 5843c25c43cff..9125048e5f6cd 100644 --- a/packages/kbn-es-query/src/filters/lib/exists_filter.ts +++ b/src/plugins/data/common/es_query/filters/exists_filter.ts @@ -18,6 +18,7 @@ */ import { Filter, FilterMeta } from './meta_filter'; +import { IndexPattern, Field } from './types'; export type ExistsFilterMeta = FilterMeta; @@ -31,3 +32,14 @@ export type ExistsFilter = Filter & { }; export const isExistsFilter = (filter: any): filter is ExistsFilter => filter && filter.exists; + +export const buildExistsFilter = (field: Field, indexPattern: IndexPattern) => { + return { + meta: { + index: indexPattern.id, + }, + exists: { + field: field.name, + }, + } as ExistsFilter; +}; diff --git a/packages/kbn-es-query/src/filters/lib/geo_bounding_box_filter.ts b/src/plugins/data/common/es_query/filters/geo_bounding_box_filter.ts similarity index 100% rename from packages/kbn-es-query/src/filters/lib/geo_bounding_box_filter.ts rename to src/plugins/data/common/es_query/filters/geo_bounding_box_filter.ts diff --git a/packages/kbn-es-query/src/filters/lib/geo_polygon_filter.ts b/src/plugins/data/common/es_query/filters/geo_polygon_filter.ts similarity index 100% rename from packages/kbn-es-query/src/filters/lib/geo_polygon_filter.ts rename to src/plugins/data/common/es_query/filters/geo_polygon_filter.ts diff --git a/src/plugins/expressions/common/expressions/index.ts b/src/plugins/data/common/es_query/filters/index.ts similarity index 68% rename from src/plugins/expressions/common/expressions/index.ts rename to src/plugins/data/common/es_query/filters/index.ts index 8c8dd7eb26ca5..e28ce9ba74975 100644 --- a/src/plugins/expressions/common/expressions/index.ts +++ b/src/plugins/data/common/es_query/filters/index.ts @@ -17,7 +17,16 @@ * under the License. */ +export * from './custom_filter'; +export * from './exists_filter'; +export * from './geo_bounding_box_filter'; +export * from './geo_polygon_filter'; +export * from './match_all_filter'; +export * from './meta_filter'; +export * from './missing_filter'; +export * from './phrase_filter'; +export * from './phrases_filter'; +export * from './query_string_filter'; +export * from './range_filter'; + export * from './types'; -export { Type } from './interpreter'; -export { interpreterProvider } from './interpreter_provider'; -export { serializeProvider, getType } from './serialize_provider'; diff --git a/packages/kbn-es-query/src/filters/lib/match_all_filter.ts b/src/plugins/data/common/es_query/filters/match_all_filter.ts similarity index 100% rename from packages/kbn-es-query/src/filters/lib/match_all_filter.ts rename to src/plugins/data/common/es_query/filters/match_all_filter.ts diff --git a/packages/kbn-es-query/src/filters/lib/meta_filter.ts b/src/plugins/data/common/es_query/filters/meta_filter.ts similarity index 75% rename from packages/kbn-es-query/src/filters/lib/meta_filter.ts rename to src/plugins/data/common/es_query/filters/meta_filter.ts index 8f6aef782cea2..9adfdc4eedcb3 100644 --- a/packages/kbn-es-query/src/filters/lib/meta_filter.ts +++ b/src/plugins/data/common/es_query/filters/meta_filter.ts @@ -55,7 +55,7 @@ export interface LatLon { lon: number; } -export function buildEmptyFilter(isPinned: boolean, index?: string): Filter { +export const buildEmptyFilter = (isPinned: boolean, index?: string): Filter => { const meta: FilterMeta = { disabled: false, negate: false, @@ -65,43 +65,43 @@ export function buildEmptyFilter(isPinned: boolean, index?: string): Filter { const $state: FilterState = { store: isPinned ? FilterStateStore.GLOBAL_STATE : FilterStateStore.APP_STATE, }; + return { meta, $state }; -} +}; -export function isFilterPinned(filter: Filter) { +export const isFilterPinned = (filter: Filter) => { return filter.$state && filter.$state.store === FilterStateStore.GLOBAL_STATE; -} +}; -export function toggleFilterDisabled(filter: Filter) { +export const toggleFilterDisabled = (filter: Filter) => { const disabled = !filter.meta.disabled; const meta = { ...filter.meta, disabled }; + return { ...filter, meta }; -} +}; -export function toggleFilterNegated(filter: Filter) { +export const toggleFilterNegated = (filter: Filter) => { const negate = !filter.meta.negate; const meta = { ...filter.meta, negate }; + return { ...filter, meta }; -} +}; -export function toggleFilterPinned(filter: Filter) { +export const toggleFilterPinned = (filter: Filter) => { const store = isFilterPinned(filter) ? FilterStateStore.APP_STATE : FilterStateStore.GLOBAL_STATE; const $state = { ...filter.$state, store }; + return { ...filter, $state }; -} +}; -export function enableFilter(filter: Filter) { - return !filter.meta.disabled ? filter : toggleFilterDisabled(filter); -} +export const enableFilter = (filter: Filter) => + !filter.meta.disabled ? filter : toggleFilterDisabled(filter); -export function disableFilter(filter: Filter) { - return filter.meta.disabled ? filter : toggleFilterDisabled(filter); -} +export const disableFilter = (filter: Filter) => + filter.meta.disabled ? filter : toggleFilterDisabled(filter); -export function pinFilter(filter: Filter) { - return isFilterPinned(filter) ? filter : toggleFilterPinned(filter); -} +export const pinFilter = (filter: Filter) => + isFilterPinned(filter) ? filter : toggleFilterPinned(filter); -export function unpinFilter(filter: Filter) { - return !isFilterPinned(filter) ? filter : toggleFilterPinned(filter); -} +export const unpinFilter = (filter: Filter) => + !isFilterPinned(filter) ? filter : toggleFilterPinned(filter); diff --git a/packages/kbn-es-query/src/filters/lib/missing_filter.ts b/src/plugins/data/common/es_query/filters/missing_filter.ts similarity index 100% rename from packages/kbn-es-query/src/filters/lib/missing_filter.ts rename to src/plugins/data/common/es_query/filters/missing_filter.ts diff --git a/src/plugins/data/common/es_query/filters/phrase_filter.test.ts b/src/plugins/data/common/es_query/filters/phrase_filter.test.ts new file mode 100644 index 0000000000000..ec13e28c583d1 --- /dev/null +++ b/src/plugins/data/common/es_query/filters/phrase_filter.test.ts @@ -0,0 +1,97 @@ +/* + * 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 { buildInlineScriptForPhraseFilter, buildPhraseFilter } from './phrase_filter'; +import { IndexPattern } from './types'; +import { getField } from '../__tests__/fields_mock'; + +describe('Phrase filter builder', () => { + let indexPattern: IndexPattern; + + beforeEach(() => { + indexPattern = { + id: 'id', + }; + }); + + it('should be a function', () => { + expect(typeof buildPhraseFilter).toBe('function'); + }); + + it('should return a match query filter when passed a standard field', () => { + const field = getField('bytes'); + + expect(buildPhraseFilter(field, 5, indexPattern)).toEqual({ + meta: { + index: 'id', + }, + query: { + match_phrase: { + bytes: 5, + }, + }, + }); + }); + + it('should return a script filter when passed a scripted field', () => { + const field = getField('script number'); + + expect(buildPhraseFilter(field, 5, indexPattern)).toEqual({ + meta: { + index: 'id', + field: 'script number', + }, + script: { + script: { + lang: 'expression', + params: { + value: 5, + }, + source: '(1234) == value', + }, + }, + }); + }); +}); + +describe('buildInlineScriptForPhraseFilter', () => { + it('should wrap painless scripts in a lambda', () => { + const field = { + lang: 'painless', + script: 'return foo;', + }; + + const expected = + `boolean compare(Supplier s, def v) {return s.get() == v;}` + + `compare(() -> { return foo; }, params.value);`; + + expect(buildInlineScriptForPhraseFilter(field)).toBe(expected); + }); + + it('should create a simple comparison for other langs', () => { + const field = { + lang: 'expression', + script: 'doc[bytes].value', + }; + + const expected = `(doc[bytes].value) == value`; + + expect(buildInlineScriptForPhraseFilter(field)).toBe(expected); + }); +}); diff --git a/src/plugins/data/common/es_query/filters/phrase_filter.ts b/src/plugins/data/common/es_query/filters/phrase_filter.ts new file mode 100644 index 0000000000000..15c5c9d4ad2e6 --- /dev/null +++ b/src/plugins/data/common/es_query/filters/phrase_filter.ts @@ -0,0 +1,144 @@ +/* + * 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, isPlainObject } from 'lodash'; +import { Filter, FilterMeta } from './meta_filter'; +import { IndexPattern, Field } from './types'; + +export type PhraseFilterMeta = FilterMeta & { + params?: { + query: string; // The unformatted value + }; + script?: { + script: { + source?: any; + lang?: string; + params: any; + }; + }; + field?: any; + index?: any; +}; + +export type PhraseFilter = Filter & { + meta: PhraseFilterMeta; +}; + +type PhraseFilterValue = string | number | boolean; + +export const isPhraseFilter = (filter: any): filter is PhraseFilter => { + const isMatchPhraseQuery = filter && filter.query && filter.query.match_phrase; + + const isDeprecatedMatchPhraseQuery = + filter && + filter.query && + filter.query.match && + Object.values(filter.query.match).find((params: any) => params.type === 'phrase'); + + return !!(isMatchPhraseQuery || isDeprecatedMatchPhraseQuery); +}; + +export const isScriptedPhraseFilter = (filter: any): filter is PhraseFilter => + Boolean(get(filter, 'script.script.params.value')); + +export const getPhraseFilterField = (filter: PhraseFilter) => { + const queryConfig = filter.query.match_phrase || filter.query.match; + return Object.keys(queryConfig)[0]; +}; + +export const getPhraseFilterValue = (filter: PhraseFilter): PhraseFilterValue => { + const queryConfig = filter.query.match_phrase || filter.query.match; + const queryValue = Object.values(queryConfig)[0] as any; + return isPlainObject(queryValue) ? queryValue.query : queryValue; +}; + +export const buildPhraseFilter = ( + field: Field, + value: any, + indexPattern: IndexPattern +): PhraseFilter => { + const convertedValue = getConvertedValueForField(field, value); + + if (field.scripted) { + return { + meta: { index: indexPattern.id, field: field.name } as PhraseFilterMeta, + script: getPhraseScript(field, value), + } as PhraseFilter; + } else { + return { + meta: { index: indexPattern.id }, + query: { + match_phrase: { + [field.name]: convertedValue, + }, + }, + } as PhraseFilter; + } +}; + +export const getPhraseScript = (field: Field, value: string) => { + const convertedValue = getConvertedValueForField(field, value); + const script = buildInlineScriptForPhraseFilter(field); + + return { + script: { + source: script, + lang: field.lang, + params: { + value: convertedValue, + }, + }, + }; +}; + +// See https://github.com/elastic/elasticsearch/issues/20941 and https://github.com/elastic/kibana/issues/8677 +// and https://github.com/elastic/elasticsearch/pull/22201 +// for the reason behind this change. Aggs now return boolean buckets with a key of 1 or 0. +export const getConvertedValueForField = (field: Field, value: any) => { + if (typeof value !== 'boolean' && field.type === 'boolean') { + if ([1, 'true'].includes(value)) { + return true; + } else if ([0, 'false'].includes(value)) { + return false; + } else { + throw new Error(`${value} is not a valid boolean value for boolean field ${field.name}`); + } + } + return value; +}; + +/** + * Takes a scripted field and returns an inline script appropriate for use in a script query. + * Handles lucene expression and Painless scripts. Other langs aren't guaranteed to generate valid + * scripts. + * + * @param {object} scriptedField A Field object representing a scripted field + * @returns {string} The inline script string + */ +export const buildInlineScriptForPhraseFilter = (scriptedField: any) => { + // We must wrap painless scripts in a lambda in case they're more than a simple expression + if (scriptedField.lang === 'painless') { + return ( + `boolean compare(Supplier s, def v) {return s.get() == v;}` + + `compare(() -> { ${scriptedField.script} }, params.value);` + ); + } else { + return `(${scriptedField.script}) == value`; + } +}; diff --git a/packages/kbn-es-query/src/filters/phrases.js b/src/plugins/data/common/es_query/filters/phrases_filter.ts similarity index 51% rename from packages/kbn-es-query/src/filters/phrases.js rename to src/plugins/data/common/es_query/filters/phrases_filter.ts index f02b3763f37bb..e4606695c0f6a 100644 --- a/packages/kbn-es-query/src/filters/phrases.js +++ b/src/plugins/data/common/es_query/filters/phrases_filter.ts @@ -17,47 +17,54 @@ * under the License. */ -import { getPhraseScript } from './phrase'; +import { Filter, FilterMeta } from './meta_filter'; +import { Field, IndexPattern } from './types'; +import { getPhraseScript } from './phrase_filter'; + +export type PhrasesFilterMeta = FilterMeta & { + params: string[]; // The unformatted values + field?: string; +}; + +export type PhrasesFilter = Filter & { + meta: PhrasesFilterMeta; +}; + +export const isPhrasesFilter = (filter: any): filter is PhrasesFilter => + filter && filter.meta.type === 'phrases'; // Creates a filter where the given field matches one or more of the given values // params should be an array of values -export function buildPhrasesFilter(field, params, indexPattern) { +export const buildPhrasesFilter = (field: Field, params: any, indexPattern: IndexPattern) => { const index = indexPattern.id; const type = 'phrases'; const key = field.name; - const value = params - .map(value => format(field, value)) - .join(', '); - const filter = { - meta: { index, type, key, value, params } - }; + const format = (f: Field, value: any) => + f && f.format && f.format.convert ? f.format.convert(value) : value; + + const value = params.map((v: any) => format(field, v)).join(', '); let should; if (field.scripted) { - should = params.map((value) => ({ - script: getPhraseScript(field, value) + should = params.map((v: any) => ({ + script: getPhraseScript(field, v), })); } else { - should = params.map((value) => ({ + should = params.map((v: any) => ({ match_phrase: { - [field.name]: value - } + [field.name]: v, + }, })); } - filter.query = { - bool: { - should, - minimum_should_match: 1 - } - }; - - return filter; -} - -function format(field, value) { - return field && field.format && field.format.convert - ? field.format.convert(value) - : value; -} + return { + meta: { index, type, key, value, params }, + query: { + bool: { + should, + minimum_should_match: 1, + }, + }, + } as PhrasesFilter; +}; diff --git a/src/plugins/data/common/es_query/filters/query_string_filter.test.ts b/src/plugins/data/common/es_query/filters/query_string_filter.test.ts new file mode 100644 index 0000000000000..839e4f6359257 --- /dev/null +++ b/src/plugins/data/common/es_query/filters/query_string_filter.test.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 { buildQueryFilter } from './query_string_filter'; +import { IndexPattern } from './types'; + +describe('Phrase filter builder', () => { + let indexPattern: IndexPattern; + + beforeEach(() => { + indexPattern = { + id: 'id', + }; + }); + + it('should be a function', () => { + expect(typeof buildQueryFilter).toBe('function'); + }); + + it('should return a query filter when passed a standard field', () => { + expect(buildQueryFilter({ foo: 'bar' }, indexPattern.id, '')).toEqual({ + meta: { + alias: '', + index: 'id', + }, + query: { + foo: 'bar', + }, + }); + }); +}); diff --git a/packages/kbn-es-query/src/filters/lib/query_string_filter.ts b/src/plugins/data/common/es_query/filters/query_string_filter.ts similarity index 78% rename from packages/kbn-es-query/src/filters/lib/query_string_filter.ts rename to src/plugins/data/common/es_query/filters/query_string_filter.ts index 3b3b97fafba9b..901dc724aa4e4 100644 --- a/packages/kbn-es-query/src/filters/lib/query_string_filter.ts +++ b/src/plugins/data/common/es_query/filters/query_string_filter.ts @@ -18,6 +18,7 @@ */ import { Filter, FilterMeta } from './meta_filter'; +import { IndexPattern } from './types'; export type QueryStringFilterMeta = FilterMeta; @@ -32,3 +33,17 @@ export type QueryStringFilter = Filter & { export const isQueryStringFilter = (filter: any): filter is QueryStringFilter => filter && filter.query && filter.query.query_string; + +// Creates a filter corresponding to a raw Elasticsearch query DSL object +export const buildQueryFilter = ( + query: QueryStringFilter['query'], + index: IndexPattern, + alias: string +) => + ({ + query, + meta: { + index, + alias, + }, + } as QueryStringFilter); diff --git a/src/plugins/data/common/es_query/filters/range_filter.test.ts b/src/plugins/data/common/es_query/filters/range_filter.test.ts new file mode 100644 index 0000000000000..9008dc2a67294 --- /dev/null +++ b/src/plugins/data/common/es_query/filters/range_filter.test.ts @@ -0,0 +1,174 @@ +/* + * 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 { each } from 'lodash'; +import { buildRangeFilter, RangeFilter } from './range_filter'; +import { IndexPattern, Field } from './types'; +import { getField } from '../__tests__/fields_mock'; + +describe('Range filter builder', () => { + let indexPattern: IndexPattern; + + beforeEach(() => { + indexPattern = { + id: 'id', + }; + }); + + it('should be a function', () => { + expect(typeof buildRangeFilter).toBe('function'); + }); + + it('should return a range filter when passed a standard field', () => { + const field = getField('bytes'); + + expect(buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern)).toEqual({ + meta: { + index: 'id', + params: {}, + }, + range: { + bytes: { + gte: 1, + lte: 3, + }, + }, + }); + }); + + it('should return a script filter when passed a scripted field', () => { + const field = getField('script number'); + + expect(buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern)).toEqual({ + meta: { + field: 'script number', + index: 'id', + params: {}, + }, + script: { + script: { + lang: 'expression', + source: '(' + field!.script + ')>=gte && (' + field!.script + ')<=lte', + params: { + value: '>=1 <=3', + gte: 1, + lte: 3, + }, + }, + }, + }); + }); + + it('should wrap painless scripts in comparator lambdas', () => { + const field = getField('script date'); + const expected = + `boolean gte(Supplier s, def v) {return !s.get().toInstant().isBefore(Instant.parse(v))} ` + + `boolean lte(Supplier s, def v) {return !s.get().toInstant().isAfter(Instant.parse(v))}` + + `gte(() -> { ${field!.script} }, params.gte) && ` + + `lte(() -> { ${field!.script} }, params.lte)`; + + const rangeFilter = buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern); + + expect(rangeFilter.script!.script.source).toBe(expected); + }); + + it('should throw an error when gte and gt, or lte and lt are both passed', () => { + const field = getField('script number'); + + expect(() => { + buildRangeFilter(field, { gte: 1, gt: 3 }, indexPattern); + }).toThrowError(); + + expect(() => { + buildRangeFilter(field, { lte: 1, lt: 3 }, indexPattern); + }).toThrowError(); + }); + + it('to use the right operator for each of gte, gt, lt and lte', () => { + const field = getField('script number'); + + each({ gte: '>=', gt: '>', lte: '<=', lt: '<' }, (operator: string, key: any) => { + const params = { + [key]: 5, + }; + + const filter = buildRangeFilter(field, params, indexPattern); + const script = filter.script!.script; + + expect(script.source).toBe('(' + field!.script + ')' + operator + key); + expect(script.params[key]).toBe(5); + expect(script.params.value).toBe(operator + 5); + }); + }); + + describe('when given params where one side is infinite', () => { + let field: Field; + let filter: RangeFilter; + + beforeEach(() => { + field = getField('script number'); + filter = buildRangeFilter(field, { gte: 0, lt: Infinity }, indexPattern); + }); + + describe('returned filter', () => { + it('is a script filter', () => { + expect(filter).toHaveProperty('script'); + }); + + it('contain a param for the finite side', () => { + expect(filter.script!.script.params).toHaveProperty('gte', 0); + }); + + it('does not contain a param for the infinite side', () => { + expect(filter.script!.script.params).not.toHaveProperty('lt'); + }); + + it('does not contain a script condition for the infinite side', () => { + const script = field!.script; + + expect(filter.script!.script.source).toEqual(`(${script})>=gte`); + }); + }); + }); + + describe('when given params where both sides are infinite', () => { + let field: Field; + let filter: RangeFilter; + + beforeEach(() => { + field = getField('script number'); + filter = buildRangeFilter(field, { gte: -Infinity, lt: Infinity }, indexPattern); + }); + + describe('returned filter', () => { + it('is a match_all filter', () => { + expect(filter).not.toHaveProperty('script'); + expect(filter).toHaveProperty('match_all'); + }); + + it('does not contain params', () => { + expect(filter).not.toHaveProperty('params'); + }); + + it('meta field is set to field name', () => { + expect(filter.meta.field).toEqual('script number'); + }); + }); + }); +}); diff --git a/packages/kbn-es-query/src/filters/range.js b/src/plugins/data/common/es_query/filters/range_filter.ts similarity index 51% rename from packages/kbn-es-query/src/filters/range.js rename to src/plugins/data/common/es_query/filters/range_filter.ts index 357f9209c50de..d7931f191e52b 100644 --- a/packages/kbn-es-query/src/filters/range.js +++ b/src/plugins/data/common/es_query/filters/range_filter.ts @@ -16,9 +16,12 @@ * specific language governing permissions and limitations * under the License. */ +import { map, reduce, mapValues, get, keys, pick } from 'lodash'; +import { Filter, FilterMeta } from './meta_filter'; +import { Field, IndexPattern } from './types'; -import _ from 'lodash'; const OPERANDS_IN_RANGE = 2; + const operators = { gt: '>', gte: '>=', @@ -39,33 +42,85 @@ const dateComparators = { lt: 'boolean lt(Supplier s, def v) {return s.get().toInstant().isBefore(Instant.parse(v))}', }; -function formatValue(field, params) { - return _.map(params, (val, key) => operators[key] + format(field, val)).join(' '); +export interface RangeFilterParams { + from?: number | string; + to?: number | string; + gt?: number | string; + lt?: number | string; + gte?: number | string; + lte?: number | string; + format?: string; } +const hasRangeKeys = (params: RangeFilterParams) => + Boolean( + keys(params).find((key: string) => ['gte', 'gt', 'lte', 'lt', 'from', 'to'].includes(key)) + ); + +export type RangeFilterMeta = FilterMeta & { + params: RangeFilterParams; + field?: any; + formattedValue?: string; +}; + +export type RangeFilter = Filter & { + meta: RangeFilterMeta; + script?: { + script: { + params: any; + lang: string; + source: any; + }; + }; + match_all?: any; + range: { [key: string]: RangeFilterParams }; +}; + +export const isRangeFilter = (filter: any): filter is RangeFilter => filter && filter.range; + +export const isScriptedRangeFilter = (filter: any): filter is RangeFilter => { + const params: RangeFilterParams = get(filter, 'script.script.params', {}); + + return hasRangeKeys(params); +}; + +const formatValue = (field: Field, params: any[]) => + map(params, (val: any, key: string) => get(operators, key) + format(field, val)).join(' '); + +const format = (field: Field, value: any) => + field && field.format && field.format.convert ? field.format.convert(value) : value; + // Creates a filter where the value for the given field is in the given range // params should be an object containing `lt`, `lte`, `gt`, and/or `gte` -export function buildRangeFilter(field, params, indexPattern, formattedValue) { - const filter = { meta: { index: indexPattern.id } }; - if (formattedValue) filter.meta.formattedValue = formattedValue; +export const buildRangeFilter = ( + field: Field, + params: RangeFilterParams, + indexPattern: IndexPattern, + formattedValue?: string +): RangeFilter => { + const filter: any = { meta: { index: indexPattern.id, params: {} } }; + + if (formattedValue) { + filter.meta.formattedValue = formattedValue; + } - params = _.mapValues(params, (value) => { - return (field.type === 'number') ? parseFloat(value) : value; - }); + params = mapValues(params, value => (field.type === 'number' ? parseFloat(value) : value)); if ('gte' in params && 'gt' in params) throw new Error('gte and gt are mutually exclusive'); if ('lte' in params && 'lt' in params) throw new Error('lte and lt are mutually exclusive'); - const totalInfinite = ['gt', 'lt'].reduce((totalInfinite, op) => { + const totalInfinite = ['gt', 'lt'].reduce((acc: number, op: any) => { const key = op in params ? op : `${op}e`; - const isInfinite = Math.abs(params[key]) === Infinity; + const isInfinite = Math.abs(get(params, key)) === Infinity; if (isInfinite) { - totalInfinite++; + acc++; + + // @ts-ignore delete params[key]; } - return totalInfinite; + return acc; }, 0); if (totalInfinite === OPERANDS_IN_RANGE) { @@ -81,25 +136,29 @@ export function buildRangeFilter(field, params, indexPattern, formattedValue) { filter.range[field.name] = params; } - return filter; -} + return filter as RangeFilter; +}; -export function getRangeScript(field, params) { - const knownParams = _.pick(params, (val, key) => { - return key in operators; - }); - let script = _.map(knownParams, function (val, key) { - return '(' + field.script + ')' + operators[key] + key; - }).join(' && '); +export const getRangeScript = (field: IndexPattern, params: RangeFilterParams) => { + const knownParams = pick(params, (val, key: any) => key in operators); + let script = map( + knownParams, + (val: any, key: string) => '(' + field.script + ')' + get(operators, key) + key + ).join(' && '); // We must wrap painless scripts in a lambda in case they're more than a simple expression if (field.lang === 'painless') { const comp = field.type === 'date' ? dateComparators : comparators; - const currentComparators = _.reduce(knownParams, (acc, val, key) => acc.concat(comp[key]), []).join(' '); + const currentComparators = reduce( + knownParams, + (acc, val, key) => acc.concat(get(comp, key)), + [] + ).join(' '); - const comparisons = _.map(knownParams, function (val, key) { - return `${key}(() -> { ${field.script} }, params.${key})`; - }).join(' && '); + const comparisons = map( + knownParams, + (val, key) => `${key}(() -> { ${field.script} }, params.${key})` + ).join(' && '); script = `${currentComparators}${comparisons}`; } @@ -108,14 +167,7 @@ export function getRangeScript(field, params) { script: { source: script, params: knownParams, - lang: field.lang - } + lang: field.lang, + }, }; -} - -function format(field, value) { - return field && field.format && field.format.convert - ? field.format.convert(value) - : value; -} - +}; diff --git a/src/plugins/data/common/es_query/filters/types.ts b/src/plugins/data/common/es_query/filters/types.ts new file mode 100644 index 0000000000000..2814735061999 --- /dev/null +++ b/src/plugins/data/common/es_query/filters/types.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 { ExistsFilter } from './exists_filter'; +import { GeoBoundingBoxFilter } from './geo_bounding_box_filter'; +import { GeoPolygonFilter } from './geo_polygon_filter'; +import { PhrasesFilter } from './phrases_filter'; +import { PhraseFilter } from './phrase_filter'; +import { RangeFilter } from './range_filter'; +import { MatchAllFilter } from './match_all_filter'; +import { MissingFilter } from './missing_filter'; + +// Any filter associated with a field (used in the filter bar/editor) +export type FieldFilter = + | ExistsFilter + | GeoBoundingBoxFilter + | GeoPolygonFilter + | PhraseFilter + | PhrasesFilter + | RangeFilter + | MatchAllFilter + | MissingFilter; + +export enum FILTERS { + CUSTOM = 'custom', + PHRASES = 'phrases', + PHRASE = 'phrase', + EXISTS = 'exists', + MATCH_ALL = 'match_all', + MISSING = 'missing', + QUERY_STRING = 'query_string', + RANGE = 'range', + GEO_BOUNDING_BOX = 'geo_bounding_box', + GEO_POLYGON = 'geo_polygon', +} + +// We can't import the real types from the data plugin, so need to either duplicate +// them here or figure out another solution, perhaps housing them in this package +// will be replaces after Fieds / IndexPattern will be moved into new platform +export type Field = any; +export type IndexPattern = any; diff --git a/src/plugins/data/common/es_query/index.ts b/src/plugins/data/common/es_query/index.ts new file mode 100644 index 0000000000000..88e14a43cfaae --- /dev/null +++ b/src/plugins/data/common/es_query/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. + */ +import * as esFilters from './filters'; + +export { esFilters }; diff --git a/src/plugins/data/common/index.ts b/src/plugins/data/common/index.ts index dca7897bd2766..42b5a03fcc926 100644 --- a/src/plugins/data/common/index.ts +++ b/src/plugins/data/common/index.ts @@ -20,5 +20,6 @@ export * from './query'; export * from './field_formats'; export * from './kbn_field_types'; +export * from './es_query'; export * from './types'; diff --git a/src/plugins/data/public/autocomplete_provider/types.ts b/src/plugins/data/public/autocomplete_provider/types.ts index 4b1c5dfbd3528..1f2d8f914dde3 100644 --- a/src/plugins/data/public/autocomplete_provider/types.ts +++ b/src/plugins/data/public/autocomplete_provider/types.ts @@ -17,7 +17,7 @@ * under the License. */ -import { StaticIndexPattern } from 'ui/index_patterns'; +import { StaticIndexPattern, Field } from 'ui/index_patterns'; import { AutocompleteProviderRegister } from '.'; export type AutocompletePublicPluginSetup = Pick< @@ -50,11 +50,22 @@ export type AutocompleteSuggestionType = | 'conjunction' | 'recentSearch'; +// A union type allows us to do easy type guards in the code. For example, if I want to ensure I'm +// working with a FieldAutocompleteSuggestion, I can just do `if ('field' in suggestion)` and the +// TypeScript compiler will narrow the type to the parts of the union that have a field prop. /** @public **/ -export interface AutocompleteSuggestion { +export type AutocompleteSuggestion = BasicAutocompleteSuggestion | FieldAutocompleteSuggestion; + +interface BasicAutocompleteSuggestion { description?: string; end: number; start: number; text: string; type: AutocompleteSuggestionType; + cursorIndex?: number; } + +export type FieldAutocompleteSuggestion = BasicAutocompleteSuggestion & { + type: 'field'; + field: Field; +}; diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts index 7e1b3801b62a4..32153df69f367 100644 --- a/src/plugins/data/public/index.ts +++ b/src/plugins/data/public/index.ts @@ -34,3 +34,4 @@ export * from './types'; export { IRequestTypesMap, IResponseTypesMap } from './search'; export * from './search'; +export * from './query'; diff --git a/src/plugins/data/public/mocks.ts b/src/plugins/data/public/mocks.ts index 5e60ca93378d9..2269ba3c55bce 100644 --- a/src/plugins/data/public/mocks.ts +++ b/src/plugins/data/public/mocks.ts @@ -18,6 +18,7 @@ */ import { Plugin } from '.'; import { searchSetupMock } from './search/mocks'; +import { queryServiceMock } from './query/mocks'; export type Setup = jest.Mocked>; export type Start = jest.Mocked>; @@ -29,19 +30,23 @@ const autocompleteMock: any = { }; const createSetupContract = (): Setup => { + const querySetupMock = queryServiceMock.createSetupContract(); const setupContract: Setup = { autocomplete: autocompleteMock as Setup['autocomplete'], search: searchSetupMock, + query: querySetupMock, }; return setupContract; }; const createStartContract = (): Start => { + const queryStartMock = queryServiceMock.createStartContract(); const startContract: Start = { autocomplete: autocompleteMock as Start['autocomplete'], getSuggestions: jest.fn(), search: { search: jest.fn() }, + query: queryStartMock, }; return startContract; }; diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts index 935a3c5754503..a13e912e77846 100644 --- a/src/plugins/data/public/plugin.ts +++ b/src/plugins/data/public/plugin.ts @@ -18,23 +18,29 @@ */ import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public'; -import { AutocompleteProviderRegister } from './autocomplete_provider'; import { DataPublicPluginSetup, DataPublicPluginStart } from './types'; -import { SearchService } from './search/search_service'; +import { AutocompleteProviderRegister } from './autocomplete_provider'; import { getSuggestionsProvider } from './suggestions_provider'; +import { SearchService } from './search/search_service'; +import { QueryService } from './query'; export class DataPublicPlugin implements Plugin { private readonly autocomplete = new AutocompleteProviderRegister(); private readonly searchService: SearchService; + private readonly queryService: QueryService; constructor(initializerContext: PluginInitializerContext) { this.searchService = new SearchService(initializerContext); + this.queryService = new QueryService(); } public setup(core: CoreSetup): DataPublicPluginSetup { return { autocomplete: this.autocomplete, search: this.searchService.setup(core), + query: this.queryService.setup({ + uiSettings: core.uiSettings, + }), }; } @@ -43,6 +49,7 @@ export class DataPublicPlugin implements Plugin { @@ -38,32 +34,17 @@ setupMock.uiSettings.get.mockImplementation((key: string) => { }); describe('filter_manager', () => { - let appStateStub: StubState; - let globalStateStub: StubState; - let updateSubscription: Subscription | undefined; let fetchSubscription: Subscription | undefined; let updateListener: sinon.SinonSpy; let filterManager: FilterManager; - let readyFilters: Filter[]; + let readyFilters: esFilters.Filter[]; beforeEach(() => { updateListener = sinon.stub(); - appStateStub = new StubState(); - globalStateStub = new StubState(); filterManager = new FilterManager(setupMock.uiSettings); readyFilters = getFiltersArray(); - - // FilterStateManager is tested indirectly. - // Therefore, we don't need it's instance. - new FilterStateManager( - globalStateStub, - () => { - return appStateStub; - }, - filterManager - ); }); afterEach(async () => { @@ -84,32 +65,6 @@ describe('filter_manager', () => { expect(updateSubscription).toBeInstanceOf(Subscription); expect(fetchSubscription).toBeInstanceOf(Subscription); }); - - test('should observe global state', done => { - updateSubscription = filterManager.getUpdates$().subscribe(() => { - expect(filterManager.getGlobalFilters()).toHaveLength(1); - if (updateSubscription) { - updateSubscription.unsubscribe(); - } - done(); - }); - - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, true, true, 'age', 34); - globalStateStub.filters.push(f1); - }); - - test('should observe app state', done => { - updateSubscription = filterManager.getUpdates$().subscribe(() => { - expect(filterManager.getAppFilters()).toHaveLength(1); - if (updateSubscription) { - updateSubscription.unsubscribe(); - } - done(); - }); - - const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34); - appStateStub.filters.push(f1); - }); }); describe('get \\ set filters', () => { @@ -127,7 +82,7 @@ describe('filter_manager', () => { test('app state should be set', async () => { updateSubscription = filterManager.getUpdates$().subscribe(updateListener); - const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34); + const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34); filterManager.setFilters([f1]); expect(filterManager.getAppFilters()).toHaveLength(1); expect(filterManager.getGlobalFilters()).toHaveLength(0); @@ -141,7 +96,7 @@ describe('filter_manager', () => { test('global state should be set', async () => { updateSubscription = filterManager.getUpdates$().subscribe(updateListener); - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); + const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); filterManager.setFilters([f1]); expect(filterManager.getAppFilters()).toHaveLength(0); expect(filterManager.getGlobalFilters()).toHaveLength(1); @@ -155,8 +110,8 @@ describe('filter_manager', () => { test('both states should be set', async () => { updateSubscription = filterManager.getUpdates$().subscribe(updateListener); - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); - const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE'); + const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); + const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE'); filterManager.setFilters([f1, f2]); expect(filterManager.getAppFilters()).toHaveLength(1); expect(filterManager.getGlobalFilters()).toHaveLength(1); @@ -173,8 +128,8 @@ describe('filter_manager', () => { test('set state should override previous state', async () => { updateSubscription = filterManager.getUpdates$().subscribe(updateListener); - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); - const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE'); + const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); + const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE'); filterManager.setFilters([f1]); filterManager.setFilters([f2]); @@ -195,7 +150,7 @@ describe('filter_manager', () => { test('changing a disabled filter should fire only update event', async function() { const updateStub = jest.fn(); const fetchStub = jest.fn(); - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, true, false, 'age', 34); + const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, true, false, 'age', 34); filterManager.setFilters([f1]); @@ -220,47 +175,63 @@ describe('filter_manager', () => { describe('add filters', () => { test('app state should accept a single filter', async function() { updateSubscription = filterManager.getUpdates$().subscribe(updateListener); - const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34); + const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34); filterManager.addFilters(f1); - expect(filterManager.getAppFilters()).toHaveLength(1); + const appFilters = filterManager.getAppFilters(); + expect(appFilters).toHaveLength(1); + expect(appFilters[0]).toEqual(f1); expect(filterManager.getGlobalFilters()).toHaveLength(0); expect(updateListener.callCount).toBe(1); - expect(appStateStub.filters.length).toBe(1); }); test('app state should accept array', async () => { - const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34); - const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'female'); + const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34); + const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'female'); filterManager.addFilters([f1]); filterManager.addFilters([f2]); - expect(filterManager.getAppFilters()).toHaveLength(2); + const appFilters = filterManager.getAppFilters(); + expect(appFilters).toHaveLength(2); + expect(appFilters).toEqual([f2, f1]); expect(filterManager.getGlobalFilters()).toHaveLength(0); - expect(appStateStub.filters.length).toBe(2); }); test('global state should accept a single filer', async () => { updateSubscription = filterManager.getUpdates$().subscribe(updateListener); - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); + const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); filterManager.addFilters(f1); expect(filterManager.getAppFilters()).toHaveLength(0); - expect(filterManager.getGlobalFilters()).toHaveLength(1); + const globalFilters = filterManager.getGlobalFilters(); + expect(globalFilters).toHaveLength(1); + expect(globalFilters[0]).toEqual(f1); expect(updateListener.callCount).toBe(1); - expect(globalStateStub.filters.length).toBe(1); }); test('global state should be accept array', async () => { - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); - const f2 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'gender', 'female'); + const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); + const f2 = getFilter( + esFilters.FilterStateStore.GLOBAL_STATE, + false, + false, + 'gender', + 'female' + ); filterManager.addFilters([f1, f2]); expect(filterManager.getAppFilters()).toHaveLength(0); - expect(filterManager.getGlobalFilters()).toHaveLength(2); - expect(globalStateStub.filters.length).toBe(2); + const globalFilters = filterManager.getGlobalFilters(); + expect(globalFilters).toHaveLength(2); + expect(globalFilters).toEqual([f2, f1]); }); test('add multiple filters at once', async () => { updateSubscription = filterManager.getUpdates$().subscribe(updateListener); - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); - const f2 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'gender', 'female'); + const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); + const f2 = getFilter( + esFilters.FilterStateStore.GLOBAL_STATE, + false, + false, + 'gender', + 'female' + ); filterManager.addFilters([f1, f2]); expect(filterManager.getAppFilters()).toHaveLength(0); expect(filterManager.getGlobalFilters()).toHaveLength(2); @@ -269,8 +240,8 @@ describe('filter_manager', () => { test('add same filter to global and app', async () => { updateSubscription = filterManager.getUpdates$().subscribe(updateListener); - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); - const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34); + const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); + const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34); filterManager.addFilters([f1, f2]); // FILTER SHOULD BE ADDED ONLY ONCE, TO GLOBAL @@ -281,8 +252,8 @@ describe('filter_manager', () => { test('add same filter with different values to global and app', async () => { updateSubscription = filterManager.getUpdates$().subscribe(updateListener); - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 38); - const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34); + const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 38); + const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34); filterManager.addFilters([f1, f2]); // FILTER SHOULD BE ADDED TWICE @@ -292,7 +263,7 @@ describe('filter_manager', () => { }); test('add filter with no state, and force pin', async () => { - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 38); + const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 38); f1.$state = undefined; filterManager.addFilters([f1], true); @@ -301,12 +272,12 @@ describe('filter_manager', () => { const f1Output = filterManager.getFilters()[0]; expect(f1Output.$state).toBeDefined(); if (f1Output.$state) { - expect(f1Output.$state.store).toBe(FilterStateStore.GLOBAL_STATE); + expect(f1Output.$state.store).toBe(esFilters.FilterStateStore.GLOBAL_STATE); } }); test('add filter with no state, and dont force pin', async () => { - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 38); + const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 38); f1.$state = undefined; filterManager.addFilters([f1], false); @@ -315,7 +286,7 @@ describe('filter_manager', () => { const f1Output = filterManager.getFilters()[0]; expect(f1Output.$state).toBeDefined(); if (f1Output.$state) { - expect(f1Output.$state.store).toBe(FilterStateStore.APP_STATE); + expect(f1Output.$state.store).toBe(esFilters.FilterStateStore.APP_STATE); } }); @@ -327,11 +298,11 @@ describe('filter_manager', () => { // global filters should be listed first let res = filterManager.getFilters(); expect(res).toHaveLength(2); - expect(res[0].$state && res[0].$state.store).toEqual(FilterStateStore.GLOBAL_STATE); + expect(res[0].$state && res[0].$state.store).toEqual(esFilters.FilterStateStore.GLOBAL_STATE); expect(res[0].meta.disabled).toEqual(filters[1].meta.disabled); expect(res[0].query).toEqual(filters[1].query); - expect(res[1].$state && res[1].$state.store).toEqual(FilterStateStore.APP_STATE); + expect(res[1].$state && res[1].$state.store).toEqual(esFilters.FilterStateStore.APP_STATE); expect(res[1].meta.disabled).toEqual(filters[0].meta.disabled); expect(res[1].query).toEqual(filters[0].query); @@ -351,7 +322,7 @@ describe('filter_manager', () => { const res = filterManager.getFilters(); expect(res).toHaveLength(3); _.each(res, function(filter) { - expect(filter.$state && filter.$state.store).toBe(FilterStateStore.GLOBAL_STATE); + expect(filter.$state && filter.$state.store).toBe(esFilters.FilterStateStore.GLOBAL_STATE); }); }); @@ -370,7 +341,6 @@ describe('filter_manager', () => { filterManager.addFilters(negatedFilter); // The negated filter should overwrite the positive one - expect(globalStateStub.filters.length).toBe(1); expect(filterManager.getFilters()).toHaveLength(1); expect(filterManager.getFilters()[0]).toEqual(negatedFilter); }); @@ -383,16 +353,16 @@ describe('filter_manager', () => { filterManager.addFilters(negatedFilter); // The negated filter should overwrite the positive one - expect(globalStateStub.filters.length).toBe(1); - expect(globalStateStub.filters[0]).toEqual(negatedFilter); + expect(filterManager.getFilters()).toHaveLength(1); + expect(filterManager.getFilters()[0]).toEqual(negatedFilter); // Add negate: false version of the filter const filter = _.cloneDeep(readyFilters[0]); filter.meta.negate = false; filterManager.addFilters(filter); - expect(globalStateStub.filters.length).toBe(1); - expect(globalStateStub.filters[0]).toEqual(filter); + expect(filterManager.getFilters()).toHaveLength(1); + expect(filterManager.getFilters()[0]).toEqual(filter); }); test('should fire the update and fetch events', async function() { @@ -409,10 +379,6 @@ describe('filter_manager', () => { filterManager.addFilters(readyFilters); - // updates should trigger state saves - expect(appStateStub.save.callCount).toBe(1); - expect(globalStateStub.save.callCount).toBe(1); - // this time, events should be emitted expect(fetchStub).toBeCalledTimes(1); expect(updateStub).toBeCalledTimes(1); @@ -420,26 +386,26 @@ describe('filter_manager', () => { }); describe('filter reconciliation', function() { - test('should de-dupe appStateStub filters being added', async function() { + test('should de-dupe app filters being added', async function() { const newFilter = _.cloneDeep(readyFilters[1]); filterManager.addFilters(readyFilters, false); - expect(appStateStub.filters.length).toBe(3); + expect(filterManager.getFilters()).toHaveLength(3); filterManager.addFilters(newFilter, false); - expect(appStateStub.filters.length).toBe(3); + expect(filterManager.getFilters()).toHaveLength(3); }); - test('should de-dupe globalStateStub filters being added', async function() { + test('should de-dupe global filters being added', async function() { const newFilter = _.cloneDeep(readyFilters[1]); filterManager.addFilters(readyFilters, true); - expect(globalStateStub.filters.length).toBe(3); + expect(filterManager.getFilters()).toHaveLength(3); filterManager.addFilters(newFilter, true); - expect(globalStateStub.filters.length).toBe(3); + expect(filterManager.getFilters()).toHaveLength(3); }); - test('should de-dupe globalStateStub filters being set', async () => { - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); + test('should de-dupe global filters being set', async () => { + const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); const f2 = _.cloneDeep(f1); filterManager.setFilters([f1, f2]); expect(filterManager.getAppFilters()).toHaveLength(0); @@ -447,8 +413,8 @@ describe('filter_manager', () => { expect(filterManager.getFilters()).toHaveLength(1); }); - test('should de-dupe appStateStub filters being set', async () => { - const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34); + test('should de-dupe app filters being set', async () => { + const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34); const f2 = _.cloneDeep(f1); filterManager.setFilters([f1, f2]); expect(filterManager.getAppFilters()).toHaveLength(1); @@ -463,7 +429,7 @@ describe('filter_manager', () => { const appFilter = _.cloneDeep(readyFilters[idx]); appFilter.meta.negate = true; appFilter.$state = { - store: FilterStateStore.APP_STATE, + store: esFilters.FilterStateStore.APP_STATE, }; filterManager.addFilters(appFilter); const res = filterManager.getFilters(); @@ -475,12 +441,12 @@ describe('filter_manager', () => { }); }); - test('should merge conflicting appStateStub filters', async function() { + test('should merge conflicting app filters', async function() { filterManager.addFilters(readyFilters, true); const appFilter = _.cloneDeep(readyFilters[1]); appFilter.meta.negate = true; appFilter.$state = { - store: FilterStateStore.APP_STATE, + store: esFilters.FilterStateStore.APP_STATE, }; filterManager.addFilters(appFilter, false); @@ -489,7 +455,7 @@ describe('filter_manager', () => { expect(res).toHaveLength(3); expect( res.filter(function(filter) { - return filter.$state && filter.$state.store === FilterStateStore.GLOBAL_STATE; + return filter.$state && filter.$state.store === esFilters.FilterStateStore.GLOBAL_STATE; }).length ).toBe(3); }); @@ -542,8 +508,8 @@ describe('filter_manager', () => { }); test('remove on full should clean and fire events', async () => { - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); - const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE'); + const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); + const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE'); filterManager.setFilters([f1, f2]); updateSubscription = filterManager.getUpdates$().subscribe(updateListener); @@ -553,9 +519,9 @@ describe('filter_manager', () => { }); test('remove non existing filter should do nothing and not fire events', async () => { - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); - const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE'); - const f3 = getFilter(FilterStateStore.APP_STATE, false, false, 'country', 'US'); + const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); + const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE'); + const f3 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'country', 'US'); filterManager.setFilters([f1, f2]); expect(filterManager.getFilters()).toHaveLength(2); @@ -566,9 +532,9 @@ describe('filter_manager', () => { }); test('remove existing filter should remove and fire events', async () => { - const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); - const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE'); - const f3 = getFilter(FilterStateStore.APP_STATE, false, false, 'country', 'US'); + const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34); + const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE'); + const f3 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'country', 'US'); filterManager.setFilters([f1, f2, f3]); expect(filterManager.getFilters()).toHaveLength(3); @@ -580,16 +546,16 @@ describe('filter_manager', () => { test('should remove the filter from appStateStub', async function() { filterManager.addFilters(readyFilters, false); - expect(appStateStub.filters).toHaveLength(3); + expect(filterManager.getAppFilters()).toHaveLength(3); filterManager.removeFilter(readyFilters[0]); - expect(appStateStub.filters).toHaveLength(2); + expect(filterManager.getAppFilters()).toHaveLength(2); }); test('should remove the filter from globalStateStub', async function() { filterManager.addFilters(readyFilters, true); - expect(globalStateStub.filters).toHaveLength(3); + expect(filterManager.getGlobalFilters()).toHaveLength(3); filterManager.removeFilter(readyFilters[0]); - expect(globalStateStub.filters).toHaveLength(2); + expect(filterManager.getGlobalFilters()).toHaveLength(2); }); test('should fire the update and fetch events', async function() { @@ -619,8 +585,8 @@ describe('filter_manager', () => { filterManager.removeFilter(readyFilters[0]); - expect(globalStateStub.filters).toHaveLength(1); - expect(appStateStub.filters).toHaveLength(1); + expect(filterManager.getAppFilters()).toHaveLength(1); + expect(filterManager.getGlobalFilters()).toHaveLength(1); }); test('should remove matching filters by comparison', async function() { @@ -629,12 +595,12 @@ describe('filter_manager', () => { filterManager.removeFilter(_.cloneDeep(readyFilters[0])); - expect(globalStateStub.filters).toHaveLength(1); - expect(appStateStub.filters).toHaveLength(1); + expect(filterManager.getAppFilters()).toHaveLength(1); + expect(filterManager.getGlobalFilters()).toHaveLength(1); filterManager.removeFilter(_.cloneDeep(readyFilters[2])); - expect(globalStateStub.filters).toHaveLength(1); - expect(appStateStub.filters).toHaveLength(0); + expect(filterManager.getAppFilters()).toHaveLength(0); + expect(filterManager.getGlobalFilters()).toHaveLength(1); }); test('should do nothing with a non-matching filter', async function() { @@ -645,19 +611,19 @@ describe('filter_manager', () => { missedFilter.meta.negate = !readyFilters[0].meta.negate; filterManager.removeFilter(missedFilter); - expect(globalStateStub.filters).toHaveLength(2); - expect(appStateStub.filters).toHaveLength(1); + expect(filterManager.getAppFilters()).toHaveLength(1); + expect(filterManager.getGlobalFilters()).toHaveLength(2); }); test('should remove all the filters from both states', async function() { filterManager.addFilters([readyFilters[0], readyFilters[1]], true); filterManager.addFilters([readyFilters[2]], false); - expect(globalStateStub.filters).toHaveLength(2); - expect(appStateStub.filters).toHaveLength(1); + expect(filterManager.getAppFilters()).toHaveLength(1); + expect(filterManager.getGlobalFilters()).toHaveLength(2); filterManager.removeAll(); - expect(globalStateStub.filters).toHaveLength(0); - expect(appStateStub.filters).toHaveLength(0); + expect(filterManager.getAppFilters()).toHaveLength(0); + expect(filterManager.getGlobalFilters()).toHaveLength(0); }); }); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_manager.ts b/src/plugins/data/public/query/filter_manager/filter_manager.ts similarity index 80% rename from src/legacy/core_plugins/data/public/filter/filter_manager/filter_manager.ts rename to src/plugins/data/public/query/filter_manager/filter_manager.ts index b3d6bd6873f50..f691398fb91d3 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_manager.ts +++ b/src/plugins/data/public/query/filter_manager/filter_manager.ts @@ -17,8 +17,6 @@ * under the License. */ -import { Filter, isFilterPinned, FilterStateStore } from '@kbn/es-query'; - import _ from 'lodash'; import { Subject } from 'rxjs'; @@ -28,10 +26,11 @@ import { compareFilters } from './lib/compare_filters'; import { mapAndFlattenFilters } from './lib/map_and_flatten_filters'; import { uniqFilters } from './lib/uniq_filters'; import { onlyDisabledFiltersChanged } from './lib/only_disabled'; -import { PartitionedFilters } from './partitioned_filters'; +import { PartitionedFilters } from './types'; +import { esFilters } from '../../../common/es_query'; export class FilterManager { - private filters: Filter[] = []; + private filters: esFilters.Filter[] = []; private updated$: Subject = new Subject(); private fetch$: Subject = new Subject(); private uiSettings: UiSettingsClientContract; @@ -40,7 +39,7 @@ export class FilterManager { this.uiSettings = uiSettings; } - private mergeIncomingFilters(partitionedFilters: PartitionedFilters): Filter[] { + private mergeIncomingFilters(partitionedFilters: PartitionedFilters): esFilters.Filter[] { const globalFilters = partitionedFilters.globalFilters; const appFilters = partitionedFilters.appFilters; @@ -61,23 +60,26 @@ export class FilterManager { return FilterManager.mergeFilters(appFilters, globalFilters); } - private static mergeFilters(appFilters: Filter[], globalFilters: Filter[]): Filter[] { + private static mergeFilters( + appFilters: esFilters.Filter[], + globalFilters: esFilters.Filter[] + ): esFilters.Filter[] { return uniqFilters(appFilters.reverse().concat(globalFilters.reverse())).reverse(); } - private static partitionFilters(filters: Filter[]): PartitionedFilters { - const [globalFilters, appFilters] = _.partition(filters, isFilterPinned); + private static partitionFilters(filters: esFilters.Filter[]): PartitionedFilters { + const [globalFilters, appFilters] = _.partition(filters, esFilters.isFilterPinned); return { globalFilters, appFilters, }; } - private handleStateUpdate(newFilters: Filter[]) { + private handleStateUpdate(newFilters: esFilters.Filter[]) { // global filters should always be first - newFilters.sort(({ $state: a }: Filter, { $state: b }: Filter): number => { - return a!.store === FilterStateStore.GLOBAL_STATE && - b!.store !== FilterStateStore.GLOBAL_STATE + newFilters.sort(({ $state: a }: esFilters.Filter, { $state: b }: esFilters.Filter): number => { + return a!.store === esFilters.FilterStateStore.GLOBAL_STATE && + b!.store !== esFilters.FilterStateStore.GLOBAL_STATE ? -1 : 1; }); @@ -124,7 +126,7 @@ export class FilterManager { /* Setters */ - public addFilters(filters: Filter[] | Filter, pinFilterStatus?: boolean) { + public addFilters(filters: esFilters.Filter[] | esFilters.Filter, pinFilterStatus?: boolean) { if (!Array.isArray(filters)) { filters = [filters]; } @@ -139,7 +141,10 @@ export class FilterManager { // Set the store of all filters. For now. // In the future, all filters should come in with filter state store already set. - const store = pinFilterStatus ? FilterStateStore.GLOBAL_STATE : FilterStateStore.APP_STATE; + const store = pinFilterStatus + ? esFilters.FilterStateStore.GLOBAL_STATE + : esFilters.FilterStateStore.APP_STATE; + FilterManager.setFiltersStore(filters, store); const mappedFilters = mapAndFlattenFilters(filters); @@ -154,14 +159,14 @@ export class FilterManager { this.handleStateUpdate(newFilters); } - public setFilters(newFilters: Filter[]) { + public setFilters(newFilters: esFilters.Filter[]) { const mappedFilters = mapAndFlattenFilters(newFilters); const newPartitionedFilters = FilterManager.partitionFilters(mappedFilters); const mergedFilters = this.mergeIncomingFilters(newPartitionedFilters); this.handleStateUpdate(mergedFilters); } - public removeFilter(filter: Filter) { + public removeFilter(filter: esFilters.Filter) { const filterIndex = _.findIndex(this.filters, item => { return _.isEqual(item.meta, filter.meta) && _.isEqual(item.query, filter.query); }); @@ -177,8 +182,8 @@ export class FilterManager { this.setFilters([]); } - public static setFiltersStore(filters: Filter[], store: FilterStateStore) { - _.map(filters, (filter: Filter) => { + public static setFiltersStore(filters: esFilters.Filter[], store: esFilters.FilterStateStore) { + _.map(filters, (filter: esFilters.Filter) => { // Override status only for filters that didn't have state in the first place. if (filter.$state === undefined) { filter.$state = { store }; diff --git a/test/api_integration/services/chance.js b/src/plugins/data/public/query/filter_manager/index.ts similarity index 77% rename from test/api_integration/services/chance.js rename to src/plugins/data/public/query/filter_manager/index.ts index 3c5d9dc704aae..7955cdd825ee6 100644 --- a/test/api_integration/services/chance.js +++ b/src/plugins/data/public/query/filter_manager/index.ts @@ -17,13 +17,8 @@ * under the License. */ -import Chance from 'chance'; +export { FilterManager } from './filter_manager'; -export function ChanceProvider({ getService }) { - const log = getService('log'); - - const seed = Date.now(); - log.debug('randomness seed: %j', seed); - - return new Chance(seed); -} +export { uniqFilters } from './lib/uniq_filters'; +export { mapAndFlattenFilters } from './lib/map_and_flatten_filters'; +export { onlyDisabledFiltersChanged } from './lib/only_disabled'; diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/compare_filters.test.ts b/src/plugins/data/public/query/filter_manager/lib/compare_filters.test.ts similarity index 67% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/compare_filters.test.ts rename to src/plugins/data/public/query/filter_manager/lib/compare_filters.test.ts index e8244feb988b6..6bde6b528d07b 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/compare_filters.test.ts +++ b/src/plugins/data/public/query/filter_manager/lib/compare_filters.test.ts @@ -16,42 +16,48 @@ * specific language governing permissions and limitations * under the License. */ -import { buildQueryFilter, buildEmptyFilter, FilterStateStore } from '@kbn/es-query'; + import { compareFilters } from './compare_filters'; +import { esFilters } from '../../../../common/es_query'; describe('filter manager utilities', () => { describe('compare filters', () => { test('should compare filters', () => { - const f1 = buildQueryFilter( + const f1 = esFilters.buildQueryFilter( { _type: { match: { query: 'apache', type: 'phrase' } } }, - 'index' + 'index', + '' ); - const f2 = buildEmptyFilter(true); + const f2 = esFilters.buildEmptyFilter(true); expect(compareFilters(f1, f2)).toBeFalsy(); }); test('should compare duplicates', () => { - const f1 = buildQueryFilter( + const f1 = esFilters.buildQueryFilter( { _type: { match: { query: 'apache', type: 'phrase' } } }, - 'index' + 'index', + '' ); - const f2 = buildQueryFilter( + const f2 = esFilters.buildQueryFilter( { _type: { match: { query: 'apache', type: 'phrase' } } }, - 'index' + 'index', + '' ); expect(compareFilters(f1, f2)).toBeTruthy(); }); test('should compare duplicates, ignoring meta attributes', () => { - const f1 = buildQueryFilter( + const f1 = esFilters.buildQueryFilter( { _type: { match: { query: 'apache', type: 'phrase' } } }, - 'index1' + 'index1', + '' ); - const f2 = buildQueryFilter( + const f2 = esFilters.buildQueryFilter( { _type: { match: { query: 'apache', type: 'phrase' } } }, - 'index2' + 'index2', + '' ); expect(compareFilters(f1, f2)).toBeTruthy(); @@ -59,12 +65,20 @@ describe('filter manager utilities', () => { test('should compare duplicates, ignoring $state attributes', () => { const f1 = { - $state: { store: FilterStateStore.APP_STATE }, - ...buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'), + $state: { store: esFilters.FilterStateStore.APP_STATE }, + ...esFilters.buildQueryFilter( + { _type: { match: { query: 'apache', type: 'phrase' } } }, + 'index', + '' + ), }; const f2 = { - $state: { store: FilterStateStore.GLOBAL_STATE }, - ...buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'), + $state: { store: esFilters.FilterStateStore.GLOBAL_STATE }, + ...esFilters.buildQueryFilter( + { _type: { match: { query: 'apache', type: 'phrase' } } }, + 'index', + '' + ), }; expect(compareFilters(f1, f2)).toBeTruthy(); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/compare_filters.ts b/src/plugins/data/public/query/filter_manager/lib/compare_filters.ts similarity index 84% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/compare_filters.ts rename to src/plugins/data/public/query/filter_manager/lib/compare_filters.ts index 44bc333ae2b4f..2a7cbe6e3303b 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/compare_filters.ts +++ b/src/plugins/data/public/query/filter_manager/lib/compare_filters.ts @@ -17,8 +17,8 @@ * under the License. */ -import { Filter, FilterMeta } from '@kbn/es-query'; import { defaults, isEqual, omit } from 'lodash'; +import { esFilters } from '../../../../common/es_query'; /** * Compare two filters to see if they match @@ -29,10 +29,14 @@ import { defaults, isEqual, omit } from 'lodash'; * * @returns {bool} Filters are the same */ -export const compareFilters = (first: Filter, second: Filter, comparatorOptions: any = {}) => { +export const compareFilters = ( + first: esFilters.Filter, + second: esFilters.Filter, + comparatorOptions: any = {} +) => { let comparators: any = {}; - const mapFilter = (filter: Filter) => { - const cleaned: FilterMeta = omit(filter, excludedAttributes); + const mapFilter = (filter: esFilters.Filter) => { + const cleaned: esFilters.FilterMeta = omit(filter, excludedAttributes); if (comparators.negate) cleaned.negate = filter.meta && Boolean(filter.meta.negate); if (comparators.disabled) cleaned.disabled = filter.meta && Boolean(filter.meta.disabled); diff --git a/src/plugins/data/public/query/filter_manager/lib/dedup_filters.test.ts b/src/plugins/data/public/query/filter_manager/lib/dedup_filters.test.ts new file mode 100644 index 0000000000000..9b493add0886c --- /dev/null +++ b/src/plugins/data/public/query/filter_manager/lib/dedup_filters.test.ts @@ -0,0 +1,103 @@ +/* + * 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 { dedupFilters } from './dedup_filters'; +import { esFilters } from '../../../../common/es_query'; + +describe('filter manager utilities', () => { + describe('dedupFilters(existing, filters)', () => { + test('should return only filters which are not in the existing', () => { + const existing: esFilters.Filter[] = [ + esFilters.buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index', ''), + esFilters.buildQueryFilter( + { match: { _term: { query: 'apache', type: 'phrase' } } }, + 'index', + '' + ), + ]; + const filters: esFilters.Filter[] = [ + esFilters.buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index', ''), + esFilters.buildQueryFilter( + { match: { _term: { query: 'apache', type: 'phrase' } } }, + 'index', + '' + ), + ]; + const results = dedupFilters(existing, filters); + + expect(results).toContain(filters[0]); + expect(results).not.toContain(filters[1]); + }); + + test('should ignore the disabled attribute when comparing ', () => { + const existing: esFilters.Filter[] = [ + esFilters.buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index', ''), + { + ...esFilters.buildQueryFilter( + { match: { _term: { query: 'apache', type: 'phrase' } } }, + 'index1', + '' + ), + meta: { disabled: true, negate: false, alias: null }, + }, + ]; + const filters: esFilters.Filter[] = [ + esFilters.buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index', ''), + esFilters.buildQueryFilter( + { match: { _term: { query: 'apache', type: 'phrase' } } }, + 'index1', + '' + ), + ]; + const results = dedupFilters(existing, filters); + + expect(results).toContain(filters[0]); + expect(results).not.toContain(filters[1]); + }); + + test('should ignore $state attribute', () => { + const existing: esFilters.Filter[] = [ + esFilters.buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index', ''), + { + ...esFilters.buildQueryFilter( + { match: { _term: { query: 'apache', type: 'phrase' } } }, + 'index', + '' + ), + $state: { store: esFilters.FilterStateStore.APP_STATE }, + }, + ]; + const filters: esFilters.Filter[] = [ + esFilters.buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index', ''), + { + ...esFilters.buildQueryFilter( + { match: { _term: { query: 'apache', type: 'phrase' } } }, + 'index', + '' + ), + $state: { store: esFilters.FilterStateStore.GLOBAL_STATE }, + }, + ]; + const results = dedupFilters(existing, filters); + + expect(results).toContain(filters[0]); + expect(results).not.toContain(filters[1]); + }); + }); +}); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/dedup_filters.ts b/src/plugins/data/public/query/filter_manager/lib/dedup_filters.ts similarity index 86% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/dedup_filters.ts rename to src/plugins/data/public/query/filter_manager/lib/dedup_filters.ts index 9565cbd80b779..6d6f49cb5e833 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/dedup_filters.ts +++ b/src/plugins/data/public/query/filter_manager/lib/dedup_filters.ts @@ -17,9 +17,9 @@ * under the License. */ -import { Filter } from '@kbn/es-query'; import { filter, find } from 'lodash'; import { compareFilters } from './compare_filters'; +import { esFilters } from '../../../../../../plugins/data/public'; /** * Combine 2 filter collections, removing duplicates @@ -31,8 +31,8 @@ import { compareFilters } from './compare_filters'; * @returns {object} An array of filters that were not in existing */ export const dedupFilters = ( - existingFilters: Filter[], - filters: Filter[], + existingFilters: esFilters.Filter[], + filters: esFilters.Filter[], comparatorOptions: any = {} ) => { if (!Array.isArray(filters)) { @@ -41,8 +41,8 @@ export const dedupFilters = ( return filter( filters, - (f: Filter) => - !find(existingFilters, (existingFilter: Filter) => + (f: esFilters.Filter) => + !find(existingFilters, (existingFilter: esFilters.Filter) => compareFilters(existingFilter, f, comparatorOptions) ) ); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/generate_mapping_chain.test.ts b/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.test.ts similarity index 89% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/generate_mapping_chain.test.ts rename to src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.test.ts index c0c509634aba2..dfe3a093c6614 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/generate_mapping_chain.test.ts +++ b/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.test.ts @@ -18,8 +18,8 @@ */ import sinon from 'sinon'; -import { Filter, buildEmptyFilter } from '@kbn/es-query'; import { generateMappingChain } from './generate_mapping_chain'; +import { esFilters } from '../../../../../../plugins/data/public'; describe('filter manager utilities', () => { let mapping: any; @@ -32,7 +32,7 @@ describe('filter manager utilities', () => { describe('generateMappingChain()', () => { test('should create a chaining function which calls the next function if the error is thrown', async () => { - const filter: Filter = buildEmptyFilter(true); + const filter = esFilters.buildEmptyFilter(true); mapping.throws(filter); next.returns('good'); @@ -45,7 +45,7 @@ describe('filter manager utilities', () => { }); test('should create a chaining function which DOES NOT call the next function if the result is returned', async () => { - const filter: Filter = buildEmptyFilter(true); + const filter = esFilters.buildEmptyFilter(true); mapping.returns('good'); next.returns('bad'); @@ -57,7 +57,7 @@ describe('filter manager utilities', () => { }); test('should resolve result for the mapping function', async () => { - const filter: Filter = buildEmptyFilter(true); + const filter = esFilters.buildEmptyFilter(true); mapping.returns({ key: 'test', value: 'example' }); @@ -70,7 +70,7 @@ describe('filter manager utilities', () => { test('should call the mapping function with the argument to the chain', async () => { // @ts-ignore - const filter: Filter = { test: 'example' }; + const filter: esFilters.Filter = { test: 'example' }; mapping.returns({ key: 'test', value: 'example' }); @@ -84,7 +84,7 @@ describe('filter manager utilities', () => { }); test('should resolve result for the next function', async () => { - const filter: Filter = buildEmptyFilter(true); + const filter = esFilters.buildEmptyFilter(true); mapping.throws(filter); next.returns({ key: 'test', value: 'example' }); @@ -98,7 +98,7 @@ describe('filter manager utilities', () => { }); test('should throw an error if no functions match', async done => { - const filter: Filter = buildEmptyFilter(true); + const filter = esFilters.buildEmptyFilter(true); mapping.throws(filter); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/generate_mapping_chain.ts b/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.ts similarity index 91% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/generate_mapping_chain.ts rename to src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.ts index 760270edd7170..b6764389e0db9 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/generate_mapping_chain.ts +++ b/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.ts @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -import { Filter } from '@kbn/es-query'; +import { esFilters } from '../../../../../../plugins/data/public'; const noop = () => { throw new Error('No mappings have been found for filter.'); }; export const generateMappingChain = (fn: Function, next: Function = noop) => { - return (filter: Filter) => { + return (filter: esFilters.Filter) => { try { return fn(filter); } catch (result) { diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_and_flatten_filters.test.ts b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.test.ts similarity index 93% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_and_flatten_filters.test.ts rename to src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.test.ts index fce2aa0373ebe..9a0d0d93698f6 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_and_flatten_filters.test.ts +++ b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.test.ts @@ -17,14 +17,14 @@ * under the License. */ -import { Filter } from '@kbn/es-query'; import { mapAndFlattenFilters } from './map_and_flatten_filters'; +import { esFilters } from '../../../../../data/public'; describe('filter manager utilities', () => { describe('mapAndFlattenFilters()', () => { let filters: unknown; - function getDisplayName(filter: Filter) { + function getDisplayName(filter: esFilters.Filter) { return typeof filter.meta.value === 'function' ? filter.meta.value() : filter.meta.value; } @@ -45,7 +45,7 @@ describe('filter manager utilities', () => { }); test('should map and flatten the filters', () => { - const results = mapAndFlattenFilters(filters as Filter[]); + const results = mapAndFlattenFilters(filters as esFilters.Filter[]); expect(results).toHaveLength(5); expect(results[0]).toHaveProperty('meta'); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_and_flatten_filters.ts b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts similarity index 80% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_and_flatten_filters.ts rename to src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts index b350c3957b142..5326d59f3e32b 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_and_flatten_filters.ts +++ b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts @@ -18,9 +18,9 @@ */ import { compact, flatten } from 'lodash'; -import { Filter } from '@kbn/es-query'; import { mapFilter } from './map_filter'; +import { esFilters } from '../../../../../data/public'; -export const mapAndFlattenFilters = (filters: Filter[]) => { - return compact(flatten(filters)).map((item: Filter) => mapFilter(item)); +export const mapAndFlattenFilters = (filters: esFilters.Filter[]) => { + return compact(flatten(filters)).map((item: esFilters.Filter) => mapFilter(item)); }; diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_filter.test.ts b/src/plugins/data/public/query/filter_manager/lib/map_filter.test.ts similarity index 89% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_filter.test.ts rename to src/plugins/data/public/query/filter_manager/lib/map_filter.test.ts index c1d4ebfd3f7fc..0d115125451ee 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_filter.test.ts +++ b/src/plugins/data/public/query/filter_manager/lib/map_filter.test.ts @@ -17,11 +17,11 @@ * under the License. */ -import { Filter } from '@kbn/es-query'; import { mapFilter } from './map_filter'; +import { esFilters } from '../../../../../data/public'; describe('filter manager utilities', () => { - function getDisplayName(filter: Filter) { + function getDisplayName(filter: esFilters.Filter) { return typeof filter.meta.value === 'function' ? filter.meta.value() : filter.meta.value; } @@ -31,7 +31,7 @@ describe('filter manager utilities', () => { meta: { index: 'logstash-*' }, query: { match: { _type: { query: 'apache', type: 'phrase' } } }, }; - const after = mapFilter(before as Filter); + const after = mapFilter(before as esFilters.Filter); expect(after).toHaveProperty('meta'); expect(after.meta).toHaveProperty('key', '_type'); @@ -43,7 +43,7 @@ describe('filter manager utilities', () => { test('should map exists filters', async () => { const before: any = { meta: { index: 'logstash-*' }, exists: { field: '@timestamp' } }; - const after = mapFilter(before as Filter); + const after = mapFilter(before as esFilters.Filter); expect(after).toHaveProperty('meta'); expect(after.meta).toHaveProperty('key', '@timestamp'); @@ -55,7 +55,7 @@ describe('filter manager utilities', () => { test('should map missing filters', async () => { const before: any = { meta: { index: 'logstash-*' }, missing: { field: '@timestamp' } }; - const after = mapFilter(before as Filter); + const after = mapFilter(before as esFilters.Filter); expect(after).toHaveProperty('meta'); expect(after.meta).toHaveProperty('key', '@timestamp'); @@ -67,7 +67,7 @@ describe('filter manager utilities', () => { test('should map json filter', async () => { const before: any = { meta: { index: 'logstash-*' }, query: { match_all: {} } }; - const after = mapFilter(before as Filter); + const after = mapFilter(before as esFilters.Filter); expect(after).toHaveProperty('meta'); expect(after.meta).toHaveProperty('key', 'query'); @@ -81,7 +81,7 @@ describe('filter manager utilities', () => { const before: any = { meta: { index: 'logstash-*' } }; try { - mapFilter(before as Filter); + mapFilter(before as esFilters.Filter); } catch (e) { expect(e).toBeInstanceOf(Error); expect(e.message).toBe('No mappings have been found for filter.'); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_filter.ts b/src/plugins/data/public/query/filter_manager/lib/map_filter.ts similarity index 81% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_filter.ts rename to src/plugins/data/public/query/filter_manager/lib/map_filter.ts index c0d251e647fd1..2dc855caabfd3 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_filter.ts +++ b/src/plugins/data/public/query/filter_manager/lib/map_filter.ts @@ -17,22 +17,22 @@ * under the License. */ -import { Filter } from '@kbn/es-query'; import { reduceRight } from 'lodash'; -import { mapMatchAll } from './map_match_all'; -import { mapPhrase } from './map_phrase'; -import { mapPhrases } from './map_phrases'; -import { mapRange } from './map_range'; -import { mapExists } from './map_exists'; -import { mapMissing } from './map_missing'; -import { mapQueryString } from './map_query_string'; -import { mapGeoBoundingBox } from './map_geo_bounding_box'; -import { mapGeoPolygon } from './map_geo_polygon'; -import { mapDefault } from './map_default'; +import { mapMatchAll } from './mappers/map_match_all'; +import { mapPhrase } from './mappers/map_phrase'; +import { mapPhrases } from './mappers/map_phrases'; +import { mapRange } from './mappers/map_range'; +import { mapExists } from './mappers/map_exists'; +import { mapMissing } from './mappers/map_missing'; +import { mapQueryString } from './mappers/map_query_string'; +import { mapGeoBoundingBox } from './mappers/map_geo_bounding_box'; +import { mapGeoPolygon } from './mappers/map_geo_polygon'; +import { mapDefault } from './mappers/map_default'; import { generateMappingChain } from './generate_mapping_chain'; +import { esFilters } from '../../../../../data/public'; -export function mapFilter(filter: Filter) { +export function mapFilter(filter: esFilters.Filter) { /** Mappers **/ // Each mapper is a simple promise function that test if the mapper can diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_default.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.test.ts similarity index 85% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_default.test.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_default.test.ts index acb6e89711033..f10766901e5b7 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_default.test.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.test.ts @@ -16,13 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -import { CustomFilter, buildEmptyFilter, buildQueryFilter } from '@kbn/es-query'; + import { mapDefault } from './map_default'; +import { esFilters } from '../../../../../common/es_query'; describe('filter manager utilities', () => { describe('mapDefault()', () => { test('should return the key and value for matching filters', async () => { - const filter: CustomFilter = buildQueryFilter({ match_all: {} }, 'index'); + const filter = esFilters.buildQueryFilter({ match_all: {} }, 'index', ''); const result = mapDefault(filter); expect(result).toHaveProperty('key', 'query'); @@ -30,7 +31,7 @@ describe('filter manager utilities', () => { }); test('should return undefined if there is no valid key', async () => { - const filter = buildEmptyFilter(true) as CustomFilter; + const filter = esFilters.buildEmptyFilter(true); try { mapDefault(filter); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_default.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts similarity index 86% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_default.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts index 70c191879c22e..fd84c5c742589 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_default.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts @@ -17,15 +17,15 @@ * under the License. */ -import { Filter, FILTERS } from '@kbn/es-query'; import { find, keys, get } from 'lodash'; +import { esFilters } from '../../../../../common/es_query'; -export const mapDefault = (filter: Filter) => { +export const mapDefault = (filter: esFilters.Filter) => { const metaProperty = /(^\$|meta)/; const key = find(keys(filter), item => !item.match(metaProperty)); if (key) { - const type = FILTERS.CUSTOM; + const type = esFilters.FILTERS.CUSTOM; const value = JSON.stringify(get(filter, key, {})); return { type, key, value }; diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_exists.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.test.ts similarity index 86% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_exists.test.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.test.ts index c352d3e2b9a73..ff0ed4f4e4d94 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_exists.test.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.test.ts @@ -16,14 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -import { ExistsFilter, buildEmptyFilter, buildExistsFilter } from '@kbn/es-query'; + import { mapExists } from './map_exists'; import { mapQueryString } from './map_query_string'; +import { esFilters } from '../../../../../common/es_query'; describe('filter manager utilities', () => { describe('mapExists()', () => { test('should return the key and value for matching filters', async () => { - const filter: ExistsFilter = buildExistsFilter({ name: '_type' }, 'index'); + const filter = esFilters.buildExistsFilter({ name: '_type' }, 'index'); const result = mapExists(filter); expect(result).toHaveProperty('key', '_type'); @@ -31,7 +32,7 @@ describe('filter manager utilities', () => { }); test('should return undefined for none matching', async done => { - const filter = buildEmptyFilter(true) as ExistsFilter; + const filter = esFilters.buildEmptyFilter(true); try { mapQueryString(filter); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_exists.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts similarity index 79% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_exists.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts index d539219a1ca24..63665bdd88ccb 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_exists.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts @@ -17,14 +17,14 @@ * under the License. */ -import { Filter, isExistsFilter, FILTERS } from '@kbn/es-query'; import { get } from 'lodash'; +import { esFilters } from '../../../../../common/es_query'; -export const mapExists = (filter: Filter) => { - if (isExistsFilter(filter)) { +export const mapExists = (filter: esFilters.Filter) => { + if (esFilters.isExistsFilter(filter)) { return { - type: FILTERS.EXISTS, - value: FILTERS.EXISTS, + type: esFilters.FILTERS.EXISTS, + value: esFilters.FILTERS.EXISTS, key: get(filter, 'exists.field'), }; } diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_bounding_box.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.test.ts similarity index 94% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_bounding_box.test.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.test.ts index c3c99e6f6c4a3..5fca4a652bad8 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_bounding_box.test.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.test.ts @@ -18,7 +18,7 @@ */ import { mapGeoBoundingBox } from './map_geo_bounding_box'; -import { Filter, GeoBoundingBoxFilter } from '@kbn/es-query'; +import { esFilters } from '../../../../../common/es_query'; describe('filter manager utilities', () => { describe('mapGeoBoundingBox()', () => { @@ -34,7 +34,7 @@ describe('filter manager utilities', () => { bottom_right: { lat: 15, lon: 20 }, }, }, - } as GeoBoundingBoxFilter; + } as esFilters.GeoBoundingBoxFilter; const result = mapGeoBoundingBox(filter); @@ -63,7 +63,8 @@ describe('filter manager utilities', () => { bottom_right: { lat: 15, lon: 20 }, }, }, - } as GeoBoundingBoxFilter; + } as esFilters.GeoBoundingBoxFilter; + const result = mapGeoBoundingBox(filter); expect(result).toHaveProperty('key', 'point'); @@ -82,7 +83,7 @@ describe('filter manager utilities', () => { const filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } }, - } as Filter; + } as esFilters.Filter; try { mapGeoBoundingBox(filter); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_bounding_box.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.ts similarity index 80% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_bounding_box.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.ts index 1f9b8cd842509..091e9a3f34000 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_bounding_box.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.ts @@ -16,16 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -import { - GeoBoundingBoxFilter, - Filter, - FILTERS, - isGeoBoundingBoxFilter, - FilterValueFormatter, -} from '@kbn/es-query'; +import { esFilters } from '../../../../../common/es_query'; const getFormattedValueFn = (params: any) => { - return (formatter?: FilterValueFormatter) => { + return (formatter?: esFilters.FilterValueFormatter) => { const corners = formatter ? { topLeft: formatter.convert(params.top_left), @@ -40,20 +34,20 @@ const getFormattedValueFn = (params: any) => { }; }; -const getParams = (filter: GeoBoundingBoxFilter) => { +const getParams = (filter: esFilters.GeoBoundingBoxFilter) => { const key = Object.keys(filter.geo_bounding_box).filter(k => k !== 'ignore_unmapped')[0]; const params = filter.geo_bounding_box[key]; return { key, params, - type: FILTERS.GEO_BOUNDING_BOX, + type: esFilters.FILTERS.GEO_BOUNDING_BOX, value: getFormattedValueFn(params), }; }; -export const mapGeoBoundingBox = (filter: Filter) => { - if (!isGeoBoundingBoxFilter(filter)) { +export const mapGeoBoundingBox = (filter: esFilters.Filter) => { + if (!esFilters.isGeoBoundingBoxFilter(filter)) { throw filter; } diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_polygon.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.test.ts similarity index 77% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_polygon.test.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.test.ts index ee4f9b295d682..3afa3891a24bb 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_polygon.test.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.test.ts @@ -16,23 +16,28 @@ * specific language governing permissions and limitations * under the License. */ + import { mapGeoPolygon } from './map_geo_polygon'; -import { GeoPolygonFilter, Filter } from '@kbn/es-query'; +import { esFilters } from '../../../../../common/es_query'; describe('filter manager utilities', () => { - describe('mapGeoPolygon()', () => { - test('should return the key and value for matching filters with bounds', async () => { - const filter = { - meta: { - index: 'logstash-*', - }, - geo_polygon: { - point: { - points: [{ lat: 5, lon: 10 }, { lat: 15, lon: 20 }], - }, + let filter: esFilters.GeoPolygonFilter; + + beforeEach(() => { + filter = { + meta: { + index: 'logstash-*', + }, + geo_polygon: { + point: { + points: [{ lat: 5, lon: 10 }, { lat: 15, lon: 20 }], }, - } as GeoPolygonFilter; + }, + } as esFilters.GeoPolygonFilter; + }); + describe('mapGeoPolygon()', () => { + test('should return the key and value for matching filters with bounds', async () => { const result = mapGeoPolygon(filter); expect(result).toHaveProperty('key', 'point'); @@ -48,17 +53,6 @@ describe('filter manager utilities', () => { }); test('should return the key and value even when using ignore_unmapped', async () => { - const filter = { - meta: { - index: 'logstash-*', - }, - geo_polygon: { - ignore_unmapped: true, - point: { - points: [{ lat: 5, lon: 10 }, { lat: 15, lon: 20 }], - }, - }, - } as GeoPolygonFilter; const result = mapGeoPolygon(filter); expect(result).toHaveProperty('key', 'point'); @@ -74,15 +68,15 @@ describe('filter manager utilities', () => { }); test('should return undefined for none matching', async done => { - const filter = { + const wrongFilter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } }, - } as Filter; + } as esFilters.Filter; try { - mapGeoPolygon(filter); + mapGeoPolygon(wrongFilter); } catch (e) { - expect(e).toBe(filter); + expect(e).toBe(wrongFilter); done(); } diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_polygon.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.ts similarity index 79% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_polygon.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.ts index 03ce4130d0c97..a7881b4a145a1 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_polygon.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.ts @@ -16,38 +16,33 @@ * specific language governing permissions and limitations * under the License. */ -import { - GeoPolygonFilter, - Filter, - FILTERS, - isGeoPolygonFilter, - FilterValueFormatter, -} from '@kbn/es-query'; + +import { esFilters } from '../../../../../common/es_query'; const POINTS_SEPARATOR = ', '; const getFormattedValueFn = (points: string[]) => { - return (formatter?: FilterValueFormatter) => { + return (formatter?: esFilters.FilterValueFormatter) => { return points .map((point: string) => (formatter ? formatter.convert(point) : JSON.stringify(point))) .join(POINTS_SEPARATOR); }; }; -function getParams(filter: GeoPolygonFilter) { +function getParams(filter: esFilters.GeoPolygonFilter) { const key = Object.keys(filter.geo_polygon).filter(k => k !== 'ignore_unmapped')[0]; const params = filter.geo_polygon[key]; return { key, params, - type: FILTERS.GEO_POLYGON, + type: esFilters.FILTERS.GEO_POLYGON, value: getFormattedValueFn(params.points || []), }; } -export function mapGeoPolygon(filter: Filter) { - if (!isGeoPolygonFilter(filter)) { +export function mapGeoPolygon(filter: esFilters.Filter) { + if (!esFilters.isGeoPolygonFilter(filter)) { throw filter; } return getParams(filter); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_match_all.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.test.ts similarity index 94% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_match_all.test.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.test.ts index 2f0641598a2ce..4fc6d0b492414 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_match_all.test.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.test.ts @@ -16,12 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -import { MatchAllFilter } from '@kbn/es-query'; + import { mapMatchAll } from './map_match_all'; +import { esFilters } from '../../../../../common/es_query'; describe('filter_manager/lib', () => { describe('mapMatchAll()', () => { - let filter: MatchAllFilter; + let filter: esFilters.MatchAllFilter; beforeEach(() => { filter = { diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_match_all.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.ts similarity index 81% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_match_all.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.ts index a1387e6dbe457..4e93b1d41e9a8 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_match_all.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.ts @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -import { Filter, FILTERS, isMatchAllFilter } from '@kbn/es-query'; +import { esFilters } from '../../../../../common/es_query'; -export const mapMatchAll = (filter: Filter) => { - if (isMatchAllFilter(filter)) { +export const mapMatchAll = (filter: esFilters.Filter) => { + if (esFilters.isMatchAllFilter(filter)) { return { - type: FILTERS.MATCH_ALL, + type: esFilters.FILTERS.MATCH_ALL, key: filter.meta.field, value: filter.meta.formattedValue || 'all', }; diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_missing.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.test.ts similarity index 86% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_missing.test.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.test.ts index ca23f25826906..1847eb37ca42f 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_missing.test.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.test.ts @@ -16,15 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -import { MissingFilter, buildEmptyFilter, ExistsFilter } from '@kbn/es-query'; + import { mapMissing } from './map_missing'; +import { esFilters } from '../../../../../common/es_query'; describe('filter manager utilities', () => { describe('mapMissing()', () => { test('should return the key and value for matching filters', async () => { - const filter: MissingFilter = { + const filter: esFilters.MissingFilter = { missing: { field: '_type' }, - ...buildEmptyFilter(true), + ...esFilters.buildEmptyFilter(true), }; const result = mapMissing(filter); @@ -33,7 +34,7 @@ describe('filter manager utilities', () => { }); test('should return undefined for none matching', async done => { - const filter = buildEmptyFilter(true) as ExistsFilter; + const filter = esFilters.buildEmptyFilter(true); try { mapMissing(filter); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_missing.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.ts similarity index 78% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_missing.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.ts index 861a84ed61646..51dee89ad884b 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_missing.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.ts @@ -16,13 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -import { Filter, FILTERS, isMissingFilter } from '@kbn/es-query'; -export const mapMissing = (filter: Filter) => { - if (isMissingFilter(filter)) { +import { esFilters } from '../../../../../common/es_query'; + +export const mapMissing = (filter: esFilters.Filter) => { + if (esFilters.isMissingFilter(filter)) { return { - type: FILTERS.MISSING, - value: FILTERS.MISSING, + type: esFilters.FILTERS.MISSING, + value: esFilters.FILTERS.MISSING, key: filter.missing.field, }; } diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrase.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.test.ts similarity index 93% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrase.test.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.test.ts index c95a2529add14..05372d37264b0 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrase.test.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.test.ts @@ -17,7 +17,7 @@ * under the License. */ import { mapPhrase } from './map_phrase'; -import { PhraseFilter, Filter } from '@kbn/es-query'; +import { esFilters } from '../../../../../common/es_query'; describe('filter manager utilities', () => { describe('mapPhrase()', () => { @@ -25,11 +25,13 @@ describe('filter manager utilities', () => { const filter = { meta: { index: 'logstash-*' }, query: { match: { _type: { query: 'apache', type: 'phrase' } } }, - } as PhraseFilter; + } as esFilters.PhraseFilter; + const result = mapPhrase(filter); expect(result).toHaveProperty('value'); expect(result).toHaveProperty('key', '_type'); + if (result.value) { const displayName = result.value(); expect(displayName).toBe('apache'); @@ -40,7 +42,7 @@ describe('filter manager utilities', () => { const filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } }, - } as Filter; + } as esFilters.Filter; try { mapPhrase(filter); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrase.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts similarity index 65% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrase.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts index efa348c9ad320..b6e9c2007db97 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrase.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts @@ -18,45 +18,36 @@ */ import { get } from 'lodash'; -import { - PhraseFilter, - Filter, - FILTERS, - isPhraseFilter, - isScriptedPhraseFilter, - getPhraseFilterField, - getPhraseFilterValue, - FilterValueFormatter, -} from '@kbn/es-query'; +import { esFilters } from '../../../../../common/es_query'; -const getScriptedPhraseValue = (filter: PhraseFilter) => +const getScriptedPhraseValue = (filter: esFilters.PhraseFilter) => get(filter, ['script', 'script', 'params', 'value']); const getFormattedValueFn = (value: any) => { - return (formatter?: FilterValueFormatter) => { + return (formatter?: esFilters.FilterValueFormatter) => { return formatter ? formatter.convert(value) : value; }; }; -const getParams = (filter: PhraseFilter) => { +const getParams = (filter: esFilters.PhraseFilter) => { const scriptedPhraseValue = getScriptedPhraseValue(filter); const isScriptedFilter = Boolean(scriptedPhraseValue); - const key = isScriptedFilter ? filter.meta.field || '' : getPhraseFilterField(filter); - const query = scriptedPhraseValue || getPhraseFilterValue(filter); + const key = isScriptedFilter ? filter.meta.field || '' : esFilters.getPhraseFilterField(filter); + const query = scriptedPhraseValue || esFilters.getPhraseFilterValue(filter); const params = { query }; return { key, params, - type: FILTERS.PHRASE, + type: esFilters.FILTERS.PHRASE, value: getFormattedValueFn(query), }; }; -export const isMapPhraseFilter = (filter: any): filter is PhraseFilter => - isPhraseFilter(filter) || isScriptedPhraseFilter(filter); +export const isMapPhraseFilter = (filter: any): filter is esFilters.PhraseFilter => + esFilters.isPhraseFilter(filter) || esFilters.isScriptedPhraseFilter(filter); -export const mapPhrase = (filter: Filter) => { +export const mapPhrase = (filter: esFilters.Filter) => { if (!isMapPhraseFilter(filter)) { throw filter; } diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrases.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts similarity index 85% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrases.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts index c17ff11d49fd4..7240d87d02b5a 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrases.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts @@ -17,10 +17,10 @@ * under the License. */ -import { Filter, isPhrasesFilter } from '@kbn/es-query'; +import { esFilters } from '../../../../../common/es_query'; -export const mapPhrases = (filter: Filter) => { - if (!isPhrasesFilter(filter)) { +export const mapPhrases = (filter: esFilters.Filter) => { + if (!esFilters.isPhrasesFilter(filter)) { throw filter; } diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_query_string.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.test.ts similarity index 81% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_query_string.test.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.test.ts index 4b1a5d39c405d..c60e7d3454fe0 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_query_string.test.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.test.ts @@ -17,27 +17,28 @@ * under the License. */ -import { QueryStringFilter, buildQueryFilter, buildEmptyFilter } from '@kbn/es-query'; import { mapQueryString } from './map_query_string'; +import { esFilters } from '../../../../../common/es_query'; describe('filter manager utilities', () => { describe('mapQueryString()', () => { test('should return the key and value for matching filters', async () => { - const filter: QueryStringFilter = buildQueryFilter( + const filter = esFilters.buildQueryFilter( { query_string: { query: 'foo:bar' } }, - 'index' + 'index', + '' ); - const result = mapQueryString(filter); + const result = mapQueryString(filter as esFilters.Filter); expect(result).toHaveProperty('key', 'query'); expect(result).toHaveProperty('value', 'foo:bar'); }); test('should return undefined for none matching', async done => { - const filter = buildEmptyFilter(true) as QueryStringFilter; + const filter = esFilters.buildEmptyFilter(true); try { - mapQueryString(filter); + mapQueryString(filter as esFilters.Filter); } catch (e) { expect(e).toBe(filter); done(); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_query_string.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.ts similarity index 81% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_query_string.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.ts index 94da8074edd04..20c3555639a3e 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_query_string.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.ts @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -import { Filter, FILTERS, isQueryStringFilter } from '@kbn/es-query'; +import { esFilters } from '../../../../../common/es_query'; -export const mapQueryString = (filter: Filter) => { - if (isQueryStringFilter(filter)) { +export const mapQueryString = (filter: esFilters.Filter) => { + if (esFilters.isQueryStringFilter(filter)) { return { - type: FILTERS.QUERY_STRING, + type: esFilters.FILTERS.QUERY_STRING, key: 'query', value: filter.query.query_string.query, }; diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_range.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.test.ts similarity index 71% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_range.test.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_range.test.ts index 12d2919e2d47b..c0d5773d6f2c1 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_range.test.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.test.ts @@ -18,30 +18,15 @@ */ import { mapRange } from './map_range'; -import { RangeFilter, Filter, FilterMeta } from '@kbn/es-query'; +import { esFilters } from '../../../../../common/es_query'; describe('filter manager utilities', () => { describe('mapRange()', () => { test('should return the key and value for matching filters with gt/lt', async () => { const filter = { - meta: { index: 'logstash-*' } as FilterMeta, + meta: { index: 'logstash-*' } as esFilters.FilterMeta, range: { bytes: { lt: 2048, gt: 1024 } }, - } as RangeFilter; - const result = mapRange(filter); - - expect(result).toHaveProperty('key', 'bytes'); - expect(result).toHaveProperty('value'); - if (result.value) { - const displayName = result.value(); - expect(displayName).toBe('1024 to 2048'); - } - }); - - test('should return the key and value for matching filters with gte/lte', async () => { - const filter = { - meta: { index: 'logstash-*' } as FilterMeta, - range: { bytes: { lte: 2048, gte: 1024 } }, - } as RangeFilter; + } as esFilters.RangeFilter; const result = mapRange(filter); expect(result).toHaveProperty('key', 'bytes'); @@ -56,7 +41,7 @@ describe('filter manager utilities', () => { const filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } }, - } as Filter; + } as esFilters.Filter; try { mapRange(filter); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_range.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts similarity index 69% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_range.ts rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts index 76f9d3621e171..51fb970f5f03e 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_range.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts @@ -17,18 +17,11 @@ * under the License. */ -import { - Filter, - RangeFilter, - FILTERS, - isRangeFilter, - isScriptedRangeFilter, - FilterValueFormatter, -} from '@kbn/es-query'; import { get, has } from 'lodash'; +import { esFilters } from '../../../../../common/es_query'; const getFormattedValueFn = (left: any, right: any) => { - return (formatter?: FilterValueFormatter) => { + return (formatter?: esFilters.FilterValueFormatter) => { let displayValue = `${left} to ${right}`; if (formatter) { const convert = formatter.getConverterFor('text'); @@ -38,11 +31,12 @@ const getFormattedValueFn = (left: any, right: any) => { }; }; -const getFirstRangeKey = (filter: RangeFilter) => filter.range && Object.keys(filter.range)[0]; -const getRangeByKey = (filter: RangeFilter, key: string) => get(filter, ['range', key]); +const getFirstRangeKey = (filter: esFilters.RangeFilter) => + filter.range && Object.keys(filter.range)[0]; +const getRangeByKey = (filter: esFilters.RangeFilter, key: string) => get(filter, ['range', key]); -function getParams(filter: RangeFilter) { - const isScriptedRange = isScriptedRangeFilter(filter); +function getParams(filter: esFilters.RangeFilter) { + const isScriptedRange = esFilters.isScriptedRangeFilter(filter); const key: string = (isScriptedRange ? filter.meta.field : getFirstRangeKey(filter)) || ''; const params: any = isScriptedRange ? get(filter, 'script.script.params') @@ -56,13 +50,13 @@ function getParams(filter: RangeFilter) { const value = getFormattedValueFn(left, right); - return { type: FILTERS.RANGE, key, value, params }; + return { type: esFilters.FILTERS.RANGE, key, value, params }; } -export const isMapRangeFilter = (filter: any): filter is RangeFilter => - isRangeFilter(filter) || isScriptedRangeFilter(filter); +export const isMapRangeFilter = (filter: any): filter is esFilters.RangeFilter => + esFilters.isRangeFilter(filter) || esFilters.isScriptedRangeFilter(filter); -export const mapRange = (filter: Filter) => { +export const mapRange = (filter: esFilters.Filter) => { if (!isMapRangeFilter(filter)) { throw filter; } diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/only_disabled.test.ts b/src/plugins/data/public/query/filter_manager/lib/only_disabled.test.ts similarity index 77% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/only_disabled.test.ts rename to src/plugins/data/public/query/filter_manager/lib/only_disabled.test.ts index 3fedcf97a625a..b9731797c9ee3 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/only_disabled.test.ts +++ b/src/plugins/data/public/query/filter_manager/lib/only_disabled.test.ts @@ -17,8 +17,8 @@ * under the License. */ -import { Filter } from '@kbn/es-query'; import { onlyDisabledFiltersChanged } from './only_disabled'; +import { esFilters } from '../../../../../data/public'; describe('filter manager utilities', () => { describe('onlyDisabledFiltersChanged()', () => { @@ -27,20 +27,20 @@ describe('filter manager utilities', () => { { meta: { disabled: true } }, { meta: { disabled: true } }, { meta: { disabled: true } }, - ] as Filter[]; - const newFilters = [{ meta: { disabled: true } }] as Filter[]; + ] as esFilters.Filter[]; + const newFilters = [{ meta: { disabled: true } }] as esFilters.Filter[]; expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(true); }); test('should return false if there are no old filters', () => { - const newFilters = [{ meta: { disabled: false } }] as Filter[]; + const newFilters = [{ meta: { disabled: false } }] as esFilters.Filter[]; expect(onlyDisabledFiltersChanged(newFilters, undefined)).toBe(false); }); test('should return false if there are no new filters', () => { - const filters = [{ meta: { disabled: false } }] as Filter[]; + const filters = [{ meta: { disabled: false } }] as esFilters.Filter[]; expect(onlyDisabledFiltersChanged(undefined, filters)).toBe(false); }); @@ -50,8 +50,8 @@ describe('filter manager utilities', () => { { meta: { disabled: false } }, { meta: { disabled: false } }, { meta: { disabled: false } }, - ] as Filter[]; - const newFilters = [{ meta: { disabled: false } }] as Filter[]; + ] as esFilters.Filter[]; + const newFilters = [{ meta: { disabled: false } }] as esFilters.Filter[]; expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false); }); @@ -61,8 +61,8 @@ describe('filter manager utilities', () => { { meta: { disabled: true } }, { meta: { disabled: true } }, { meta: { disabled: true } }, - ] as Filter[]; - const newFilters = [{ meta: { disabled: false } }] as Filter[]; + ] as esFilters.Filter[]; + const newFilters = [{ meta: { disabled: false } }] as esFilters.Filter[]; expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false); }); @@ -72,8 +72,8 @@ describe('filter manager utilities', () => { { meta: { disabled: false } }, { meta: { disabled: false } }, { meta: { disabled: false } }, - ] as Filter[]; - const newFilters = [{ meta: { disabled: true } }] as Filter[]; + ] as esFilters.Filter[]; + const newFilters = [{ meta: { disabled: true } }] as esFilters.Filter[]; expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false); }); @@ -83,8 +83,8 @@ describe('filter manager utilities', () => { { meta: { disabled: true } }, { meta: { disabled: true } }, { meta: { disabled: true } }, - ] as Filter[]; - const newFilters = [] as Filter[]; + ] as esFilters.Filter[]; + const newFilters = [] as esFilters.Filter[]; expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(true); }); @@ -94,8 +94,8 @@ describe('filter manager utilities', () => { { meta: { disabled: false } }, { meta: { disabled: false } }, { meta: { disabled: false } }, - ] as Filter[]; - const newFilters = [] as Filter[]; + ] as esFilters.Filter[]; + const newFilters = [] as esFilters.Filter[]; expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false); }); @@ -104,11 +104,11 @@ describe('filter manager utilities', () => { const filters = [ { meta: { disabled: true, negate: false } }, { meta: { disabled: true, negate: false } }, - ] as Filter[]; + ] as esFilters.Filter[]; const newFilters = [ { meta: { disabled: true, negate: true } }, { meta: { disabled: true, negate: true } }, - ] as Filter[]; + ] as esFilters.Filter[]; expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(true); }); @@ -118,8 +118,8 @@ describe('filter manager utilities', () => { { meta: { disabled: false } }, { meta: { disabled: false } }, { meta: { disabled: true } }, - ] as Filter[]; - const newFilters = [{ meta: { disabled: false } }] as Filter[]; + ] as esFilters.Filter[]; + const newFilters = [{ meta: { disabled: false } }] as esFilters.Filter[]; expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false); }); @@ -129,15 +129,15 @@ describe('filter manager utilities', () => { { meta: { disabled: true } }, { meta: { disabled: false } }, { meta: { disabled: true } }, - ] as Filter[]; - const newFilters = [] as Filter[]; + ] as esFilters.Filter[]; + const newFilters = [] as esFilters.Filter[]; expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false); }); test('should not throw with null filters', () => { - const filters = [null, { meta: { disabled: true } }] as Filter[]; - const newFilters = [] as Filter[]; + const filters = [null, { meta: { disabled: true } }] as esFilters.Filter[]; + const newFilters = [] as esFilters.Filter[]; expect(() => { onlyDisabledFiltersChanged(newFilters, filters); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/only_disabled.ts b/src/plugins/data/public/query/filter_manager/lib/only_disabled.ts similarity index 82% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/only_disabled.ts rename to src/plugins/data/public/query/filter_manager/lib/only_disabled.ts index 9c0b5f43acb3e..0fb6894a297a1 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/only_disabled.ts +++ b/src/plugins/data/public/query/filter_manager/lib/only_disabled.ts @@ -17,17 +17,20 @@ * under the License. */ -import { Filter } from '@kbn/es-query'; import { filter, isEqual } from 'lodash'; +import { esFilters } from '../../../../../../plugins/data/public'; -const isEnabled = (f: Filter) => f && f.meta && !f.meta.disabled; +const isEnabled = (f: esFilters.Filter) => f && f.meta && !f.meta.disabled; /** * Checks to see if only disabled filters have been changed * * @returns {bool} Only disabled filters */ -export const onlyDisabledFiltersChanged = (newFilters?: Filter[], oldFilters?: Filter[]) => { +export const onlyDisabledFiltersChanged = ( + newFilters?: esFilters.Filter[], + oldFilters?: esFilters.Filter[] +) => { // If it's the same - compare only enabled filters const newEnabledFilters = filter(newFilters || [], isEnabled); const oldEnabledFilters = filter(oldFilters || [], isEnabled); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/uniq_filters.test.ts b/src/plugins/data/public/query/filter_manager/lib/uniq_filters.test.ts similarity index 54% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/uniq_filters.test.ts rename to src/plugins/data/public/query/filter_manager/lib/uniq_filters.test.ts index 86f059913cd96..08eeabc1497e3 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/uniq_filters.test.ts +++ b/src/plugins/data/public/query/filter_manager/lib/uniq_filters.test.ts @@ -16,15 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -import { Filter, buildQueryFilter, FilterStateStore } from '@kbn/es-query'; + import { uniqFilters } from './uniq_filters'; +import { esFilters } from '../../../../../data/public'; describe('filter manager utilities', () => { describe('niqFilter', () => { test('should filter out dups', () => { - const before: Filter[] = [ - buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'), - buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'), + const before: esFilters.Filter[] = [ + esFilters.buildQueryFilter( + { _type: { match: { query: 'apache', type: 'phrase' } } }, + 'index', + '' + ), + esFilters.buildQueryFilter( + { _type: { match: { query: 'apache', type: 'phrase' } } }, + 'index', + '' + ), ]; const results = uniqFilters(before); @@ -32,9 +41,17 @@ describe('filter manager utilities', () => { }); test('should filter out duplicates, ignoring meta attributes', () => { - const before: Filter[] = [ - buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index1'), - buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index2'), + const before: esFilters.Filter[] = [ + esFilters.buildQueryFilter( + { _type: { match: { query: 'apache', type: 'phrase' } } }, + 'index1', + '' + ), + esFilters.buildQueryFilter( + { _type: { match: { query: 'apache', type: 'phrase' } } }, + 'index2', + '' + ), ]; const results = uniqFilters(before); @@ -42,14 +59,22 @@ describe('filter manager utilities', () => { }); test('should filter out duplicates, ignoring $state attributes', () => { - const before: Filter[] = [ + const before: esFilters.Filter[] = [ { - $state: { store: FilterStateStore.APP_STATE }, - ...buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'), + $state: { store: esFilters.FilterStateStore.APP_STATE }, + ...esFilters.buildQueryFilter( + { _type: { match: { query: 'apache', type: 'phrase' } } }, + 'index', + '' + ), }, { - $state: { store: FilterStateStore.GLOBAL_STATE }, - ...buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'), + $state: { store: esFilters.FilterStateStore.GLOBAL_STATE }, + ...esFilters.buildQueryFilter( + { _type: { match: { query: 'apache', type: 'phrase' } } }, + 'index', + '' + ), }, ]; const results = uniqFilters(before); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/uniq_filters.ts b/src/plugins/data/public/query/filter_manager/lib/uniq_filters.ts similarity index 84% rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/uniq_filters.ts rename to src/plugins/data/public/query/filter_manager/lib/uniq_filters.ts index 12e793253371e..e96c52e6db3de 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/uniq_filters.ts +++ b/src/plugins/data/public/query/filter_manager/lib/uniq_filters.ts @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -import { Filter } from '@kbn/es-query'; import { each, union } from 'lodash'; import { dedupFilters } from './dedup_filters'; +import { esFilters } from '../../../../../data/public'; /** * Remove duplicate filters from an array of filters @@ -28,10 +28,10 @@ import { dedupFilters } from './dedup_filters'; * @returns {object} The original filters array with duplicates removed */ -export const uniqFilters = (filters: Filter[], comparatorOptions: any = {}) => { - let results: Filter[] = []; +export const uniqFilters = (filters: esFilters.Filter[], comparatorOptions: any = {}) => { + let results: esFilters.Filter[] = []; - each(filters, (filter: Filter) => { + each(filters, (filter: esFilters.Filter) => { results = union(results, dedupFilters(results, [filter]), comparatorOptions); }); diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/get_filters_array.ts b/src/plugins/data/public/query/filter_manager/test_helpers/get_filters_array.ts similarity index 91% rename from src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/get_filters_array.ts rename to src/plugins/data/public/query/filter_manager/test_helpers/get_filters_array.ts index 27f627b477c35..aa047647c5751 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/get_filters_array.ts +++ b/src/plugins/data/public/query/filter_manager/test_helpers/get_filters_array.ts @@ -17,9 +17,9 @@ * under the License. */ -import { Filter } from '@kbn/es-query'; +import { esFilters } from '../../../../../../plugins/data/public'; -export function getFiltersArray(): Filter[] { +export function getFiltersArray(): esFilters.Filter[] { return [ { query: { match: { extension: { query: 'jpg', type: 'phrase' } } }, diff --git a/packages/kbn-es-query/src/filters/exists.js b/src/plugins/data/public/query/filter_manager/test_helpers/get_stub_filter.ts similarity index 66% rename from packages/kbn-es-query/src/filters/exists.js rename to src/plugins/data/public/query/filter_manager/test_helpers/get_stub_filter.ts index 0c82279fb4417..adc72c961b08b 100644 --- a/packages/kbn-es-query/src/filters/exists.js +++ b/src/plugins/data/public/query/filter_manager/test_helpers/get_stub_filter.ts @@ -17,14 +17,29 @@ * under the License. */ -// Creates a filter where the given field exists -export function buildExistsFilter(field, indexPattern) { +import { esFilters } from '../../../../../../plugins/data/public'; + +export function getFilter( + store: esFilters.FilterStateStore, + disabled: boolean, + negated: boolean, + queryKey: string, + queryValue: any +): esFilters.Filter { return { + $state: { + store, + }, meta: { - index: indexPattern.id + index: 'logstash-*', + disabled, + negate: negated, + alias: null, + }, + query: { + match: { + [queryKey]: queryValue, + }, }, - exists: { - field: field.name - } }; } diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/partitioned_filters.ts b/src/plugins/data/public/query/filter_manager/types.ts similarity index 86% rename from src/legacy/core_plugins/data/public/filter/filter_manager/partitioned_filters.ts rename to src/plugins/data/public/query/filter_manager/types.ts index e74b48b722cc4..0b3dbca2d6e0a 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/partitioned_filters.ts +++ b/src/plugins/data/public/query/filter_manager/types.ts @@ -17,9 +17,9 @@ * under the License. */ -import { Filter } from '@kbn/es-query'; +import { esFilters } from '../../../../../plugins/data/public'; export interface PartitionedFilters { - globalFilters: Filter[]; - appFilters: Filter[]; + globalFilters: esFilters.Filter[]; + appFilters: esFilters.Filter[]; } diff --git a/src/plugins/data/public/query/index.tsx b/src/plugins/data/public/query/index.tsx new file mode 100644 index 0000000000000..42647b9d98201 --- /dev/null +++ b/src/plugins/data/public/query/index.tsx @@ -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 * from './query_service'; +export * from './filter_manager'; diff --git a/src/legacy/core_plugins/data/public/filter/filter_service.mock.ts b/src/plugins/data/public/query/mocks.ts similarity index 80% rename from src/legacy/core_plugins/data/public/filter/filter_service.mock.ts rename to src/plugins/data/public/query/mocks.ts index 94268ef69c49a..e5030c5765316 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_service.mock.ts +++ b/src/plugins/data/public/query/mocks.ts @@ -17,12 +17,12 @@ * under the License. */ -import { FilterService, FilterStart, FilterSetup } from '.'; +import { QueryService, QueryStart, QuerySetup } from '.'; -type FilterServiceClientContract = PublicMethodsOf; +type QueryServiceClientContract = PublicMethodsOf; const createSetupContractMock = () => { - const setupContract: jest.Mocked = { + const setupContract: jest.Mocked = { filterManager: jest.fn() as any, }; @@ -30,7 +30,7 @@ const createSetupContractMock = () => { }; const createStartContractMock = () => { - const startContract: jest.Mocked = { + const startContract: jest.Mocked = { filterManager: jest.fn() as any, }; @@ -38,7 +38,7 @@ const createStartContractMock = () => { }; const createMock = () => { - const mocked: jest.Mocked = { + const mocked: jest.Mocked = { setup: jest.fn(), start: jest.fn(), stop: jest.fn(), @@ -49,7 +49,7 @@ const createMock = () => { return mocked; }; -export const filterServiceMock = { +export const queryServiceMock = { create: createMock, createSetupContract: createSetupContractMock, createStartContract: createStartContractMock, diff --git a/src/legacy/core_plugins/data/public/filter/filter_service.ts b/src/plugins/data/public/query/query_service.ts similarity index 82% rename from src/legacy/core_plugins/data/public/filter/filter_service.ts rename to src/plugins/data/public/query/query_service.ts index 0c46259ef0e00..d34909a5e03b7 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_service.ts +++ b/src/plugins/data/public/query/query_service.ts @@ -21,18 +21,18 @@ import { UiSettingsClientContract } from 'src/core/public'; import { FilterManager } from './filter_manager'; /** - * Filter Service + * Query Service * @internal */ -export interface FilterServiceDependencies { +export interface QueryServiceDependencies { uiSettings: UiSettingsClientContract; } -export class FilterService { +export class QueryService { filterManager!: FilterManager; - public setup({ uiSettings }: FilterServiceDependencies) { + public setup({ uiSettings }: QueryServiceDependencies) { this.filterManager = new FilterManager(uiSettings); return { @@ -52,5 +52,5 @@ export class FilterService { } /** @public */ -export type FilterSetup = ReturnType; -export type FilterStart = ReturnType; +export type QuerySetup = ReturnType; +export type QueryStart = ReturnType; diff --git a/src/plugins/data/public/types.ts b/src/plugins/data/public/types.ts index 5f94734fef083..9939815c1efd1 100644 --- a/src/plugins/data/public/types.ts +++ b/src/plugins/data/public/types.ts @@ -22,15 +22,18 @@ export * from './autocomplete_provider/types'; import { AutocompletePublicPluginSetup, AutocompletePublicPluginStart } from '.'; import { ISearchSetup, ISearchStart } from './search'; import { IGetSuggestions } from './suggestions_provider/types'; +import { QuerySetup, QueryStart } from './query'; export interface DataPublicPluginSetup { autocomplete: AutocompletePublicPluginSetup; search: ISearchSetup; + query: QuerySetup; } export interface DataPublicPluginStart { autocomplete: AutocompletePublicPluginStart; getSuggestions: IGetSuggestions; search: ISearchStart; + query: QueryStart; } export { IGetSuggestions } from './suggestions_provider/types'; diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts index df933167cee25..f0b6117b928cd 100644 --- a/src/plugins/data/server/index.ts +++ b/src/plugins/data/server/index.ts @@ -25,6 +25,11 @@ export function plugin(initializerContext: PluginInitializerContext) { } export { DataServerPlugin as Plugin }; +export { + IndexPatternsFetcher, + FieldDescriptor, + shouldReadFieldFromDocValues, +} from './index_patterns'; export * from './search'; diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/index.ts b/src/plugins/data/server/index_patterns/fetcher/index.ts similarity index 89% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/index.ts rename to src/plugins/data/server/index_patterns/fetcher/index.ts index 03ba836462c60..19306696885db 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/index.ts +++ b/src/plugins/data/server/index_patterns/fetcher/index.ts @@ -17,6 +17,5 @@ * under the License. */ -export * from './types'; -export * from './actions'; -export * from './embeddable'; +export * from './index_patterns_fetcher'; +export { shouldReadFieldFromDocValues } from './lib'; diff --git a/src/legacy/server/index_patterns/service/index_patterns_service.ts b/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts similarity index 95% rename from src/legacy/server/index_patterns/service/index_patterns_service.ts rename to src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts index 6c32d99ad83f9..5f1493a49ab7d 100644 --- a/src/legacy/server/index_patterns/service/index_patterns_service.ts +++ b/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts @@ -28,11 +28,15 @@ export interface FieldDescriptor { searchable: boolean; type: string; esTypes: string[]; - parent?: string; - subType?: string; + subType?: FieldSubType; } -export class IndexPatternsService { +interface FieldSubType { + multi?: { parent: string }; + nested?: { path: string }; +} + +export class IndexPatternsFetcher { private _callDataCluster: APICaller; constructor(callDataCluster: APICaller) { diff --git a/src/legacy/server/index_patterns/service/lib/errors.ts b/src/plugins/data/server/index_patterns/fetcher/lib/errors.ts similarity index 100% rename from src/legacy/server/index_patterns/service/lib/errors.ts rename to src/plugins/data/server/index_patterns/fetcher/lib/errors.ts diff --git a/src/legacy/server/index_patterns/service/lib/es_api.test.js b/src/plugins/data/server/index_patterns/fetcher/lib/es_api.test.js similarity index 100% rename from src/legacy/server/index_patterns/service/lib/es_api.test.js rename to src/plugins/data/server/index_patterns/fetcher/lib/es_api.test.js diff --git a/src/legacy/server/index_patterns/service/lib/es_api.ts b/src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts similarity index 99% rename from src/legacy/server/index_patterns/service/lib/es_api.ts rename to src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts index 63c1824784dbd..92b64fafddd66 100644 --- a/src/legacy/server/index_patterns/service/lib/es_api.ts +++ b/src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts @@ -18,7 +18,6 @@ */ import { APICaller } from 'src/core/server'; -// @ts-ignore import { convertEsError } from './errors'; import { FieldCapsResponse } from './field_capabilities'; diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/__fixtures__/es_field_caps_response.json b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/__fixtures__/es_field_caps_response.json similarity index 90% rename from src/legacy/server/index_patterns/service/lib/field_capabilities/__fixtures__/es_field_caps_response.json rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/__fixtures__/es_field_caps_response.json index 97f8c187e1680..0d70f49b5e6b5 100644 --- a/src/legacy/server/index_patterns/service/lib/field_capabilities/__fixtures__/es_field_caps_response.json +++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/__fixtures__/es_field_caps_response.json @@ -221,6 +221,27 @@ "searchable": true, "aggregatable": true } + }, + "nested_object_parent": { + "nested": { + "type": "nested", + "searchable": false, + "aggregatable": false + } + }, + "nested_object_parent.child": { + "text": { + "type": "text", + "searchable": true, + "aggregatable": false + } + }, + "nested_object_parent.child.keyword": { + "keyword": { + "type": "keyword", + "searchable": true, + "aggregatable": true + } } } } diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_capabilities.test.js b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.test.js similarity index 100% rename from src/legacy/server/index_patterns/service/lib/field_capabilities/field_capabilities.test.js rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.test.js diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_capabilities.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts similarity index 97% rename from src/legacy/server/index_patterns/service/lib/field_capabilities/field_capabilities.ts rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts index 05e8d591f13a9..c275fb714088e 100644 --- a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_capabilities.ts +++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts @@ -23,7 +23,7 @@ import { APICaller } from 'src/core/server'; import { callFieldCapsApi } from '../es_api'; import { FieldCapsResponse, readFieldCapsResponse } from './field_caps_response'; import { mergeOverrides } from './overrides'; -import { FieldDescriptor } from '../../index_patterns_service'; +import { FieldDescriptor } from '../../index_patterns_fetcher'; export function concatIfUniq(arr: T[], value: T) { return arr.includes(value) ? arr : arr.concat(value); diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.test.js b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js similarity index 76% rename from src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.test.js rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js index dfdafeea3cd78..cf4af615b9577 100644 --- a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.test.js +++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js @@ -24,7 +24,7 @@ import sinon from 'sinon'; import * as shouldReadFieldFromDocValuesNS from './should_read_field_from_doc_values'; import { shouldReadFieldFromDocValues } from './should_read_field_from_doc_values'; -import { getKbnFieldType } from '../../../../../../plugins/data/common'; +import { getKbnFieldType } from '../../../../../../data/common'; import { readFieldCapsResponse } from './field_caps_response'; import esResponse from './__fixtures__/es_field_caps_response.json'; @@ -37,10 +37,10 @@ describe('index_patterns/field_capabilities/field_caps_response', () => { describe('conflicts', () => { it('returns a field for each in response, no filtering', () => { const fields = readFieldCapsResponse(esResponse); - expect(fields).toHaveLength(22); + expect(fields).toHaveLength(24); }); - it('includes only name, type, esTypes, searchable, aggregatable, readFromDocValues, and maybe conflictDescriptions, parent, ' + + it('includes only name, type, esTypes, searchable, aggregatable, readFromDocValues, and maybe conflictDescriptions, ' + 'and subType of each field', () => { const responseClone = cloneDeep(esResponse); // try to trick it into including an extra field @@ -48,7 +48,7 @@ describe('index_patterns/field_capabilities/field_caps_response', () => { const fields = readFieldCapsResponse(responseClone); fields.forEach(field => { - const fieldWithoutOptionalKeys = omit(field, 'conflictDescriptions', 'parent', 'subType'); + const fieldWithoutOptionalKeys = omit(field, 'conflictDescriptions', 'subType'); expect(Object.keys(fieldWithoutOptionalKeys)).toEqual([ 'name', @@ -65,8 +65,8 @@ describe('index_patterns/field_capabilities/field_caps_response', () => { sandbox.spy(shouldReadFieldFromDocValuesNS, 'shouldReadFieldFromDocValues'); const fields = readFieldCapsResponse(esResponse); const conflictCount = fields.filter(f => f.type === 'conflict').length; - // +1 is for the object field which gets filtered out of the final return value from readFieldCapsResponse - sinon.assert.callCount(shouldReadFieldFromDocValues, fields.length - conflictCount + 1); + // +2 is for the object and nested fields which get filtered out of the final return value from readFieldCapsResponse + sinon.assert.callCount(shouldReadFieldFromDocValues, fields.length - conflictCount + 2); }); it('converts es types to kibana types', () => { @@ -132,20 +132,41 @@ describe('index_patterns/field_capabilities/field_caps_response', () => { expect(mixSearchableOther.searchable).toBe(true); }); - it('returns multi fields with parent and subType keys describing the relationship', () => { + it('returns multi fields with a subType key describing the relationship', () => { const fields = readFieldCapsResponse(esResponse); const child = fields.find(f => f.name === 'multi_parent.child'); - expect(child).toHaveProperty('parent', 'multi_parent'); - expect(child).toHaveProperty('subType', 'multi'); + expect(child).toHaveProperty('subType', { multi: { parent: 'multi_parent' } }); }); - it('should not confuse object children for multi field children', () => { + it('returns nested sub-fields with a subType key describing the relationship', () => { + const fields = readFieldCapsResponse(esResponse); + const child = fields.find(f => f.name === 'nested_object_parent.child'); + expect(child).toHaveProperty('subType', { nested: { path: 'nested_object_parent' } }); + }); + + it('handles fields that are both nested and multi', () => { + const fields = readFieldCapsResponse(esResponse); + const child = fields.find(f => f.name === 'nested_object_parent.child.keyword'); + expect(child).toHaveProperty( + 'subType', + { + nested: { path: 'nested_object_parent' }, + multi: { parent: 'nested_object_parent.child' } + }); + }); + + it('does not include the field actually mapped as nested itself', () => { + const fields = readFieldCapsResponse(esResponse); + const child = fields.find(f => f.name === 'nested_object_parent'); + expect(child).toBeUndefined(); + }); + + it('should not confuse object children for multi or nested field children', () => { // We detect multi fields by finding fields that have a dot in their name and then looking - // to see if their parents are *not* object or nested fields. In the future we may want to - // add parent and subType info for object and nested fields but for now we don't need it. + // to see if their parents are *not* object fields. In the future we may want to + // add subType info for object fields but for now we don't need it. const fields = readFieldCapsResponse(esResponse); const child = fields.find(f => f.name === 'object_parent.child'); - expect(child).not.toHaveProperty('parent'); expect(child).not.toHaveProperty('subType'); }); }); diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts similarity index 79% rename from src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.ts rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts index cb67d7c79cfac..06eb30db0b24b 100644 --- a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.ts +++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts @@ -18,9 +18,9 @@ */ import { uniq } from 'lodash'; -import { FieldDescriptor } from '../..'; +import { castEsToKbnFieldTypeName } from '../../../../../common'; import { shouldReadFieldFromDocValues } from './should_read_field_from_doc_values'; -import { castEsToKbnFieldTypeName } from '../../../../../../plugins/data/common'; +import { FieldDescriptor } from '../../../fetcher'; interface FieldCapObject { type: string; @@ -151,18 +151,38 @@ export function readFieldCapsResponse(fieldCapsResponse: FieldCapsResponse): Fie return field.name.includes('.'); }); - // Discern which sub fields are multi fields. If the parent field is not an object or nested field - // the child must be a multi field. + // Determine the type of each sub field. subFields.forEach(field => { - const parentFieldName = field.name + const parentFieldNames = field.name .split('.') .slice(0, -1) - .join('.'); - const parentFieldCaps = kibanaFormattedCaps.find(caps => caps.name === parentFieldName); + .map((_, index, parentFieldNameParts) => { + return parentFieldNameParts.slice(0, index + 1).join('.'); + }); + const parentFieldCaps = parentFieldNames.map(parentFieldName => { + return kibanaFormattedCaps.find(caps => caps.name === parentFieldName); + }); + const parentFieldCapsAscending = parentFieldCaps.reverse(); + + if (parentFieldCaps && parentFieldCaps.length > 0) { + let subType = {}; + // If the parent field is not an object or nested field the child must be a multi field. + const firstParent = parentFieldCapsAscending[0]; + if (firstParent && !['object', 'nested'].includes(firstParent.type)) { + subType = { ...subType, multi: { parent: firstParent.name } }; + } + + // We need to know if any parent field is nested + const nestedParentCaps = parentFieldCapsAscending.find( + parentCaps => parentCaps && parentCaps.type === 'nested' + ); + if (nestedParentCaps) { + subType = { ...subType, nested: { path: nestedParentCaps.name } }; + } - if (parentFieldCaps && !['object', 'nested'].includes(parentFieldCaps.type)) { - field.parent = parentFieldName; - field.subType = 'multi'; + if (Object.keys(subType).length > 0) { + field.subType = subType; + } } }); diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/index.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/index.ts similarity index 91% rename from src/legacy/server/index_patterns/service/lib/field_capabilities/index.ts rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/index.ts index 8ac4225557784..6a541aff56471 100644 --- a/src/legacy/server/index_patterns/service/lib/field_capabilities/index.ts +++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/index.ts @@ -19,3 +19,4 @@ export { getFieldCapabilities } from './field_capabilities'; export { FieldCapsResponse } from './field_caps_response'; +export { shouldReadFieldFromDocValues } from './should_read_field_from_doc_values'; diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/overrides.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/overrides.ts similarity index 95% rename from src/legacy/server/index_patterns/service/lib/field_capabilities/overrides.ts rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/overrides.ts index 6310bf02e4430..518bfeccac01a 100644 --- a/src/legacy/server/index_patterns/service/lib/field_capabilities/overrides.ts +++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/overrides.ts @@ -18,7 +18,7 @@ */ import { merge } from 'lodash'; -import { FieldDescriptor } from '../../index_patterns_service'; +import { FieldDescriptor } from '../../index_patterns_fetcher'; const OVERRIDES: Record> = { _source: { type: '_source' }, diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/should_read_field_from_doc_values.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.ts similarity index 100% rename from src/legacy/server/index_patterns/service/lib/field_capabilities/should_read_field_from_doc_values.ts rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.ts diff --git a/src/legacy/server/index_patterns/service/lib/index.ts b/src/plugins/data/server/index_patterns/fetcher/lib/index.ts similarity index 90% rename from src/legacy/server/index_patterns/service/lib/index.ts rename to src/plugins/data/server/index_patterns/fetcher/lib/index.ts index cd239b3753aa3..20e74d2b1a579 100644 --- a/src/legacy/server/index_patterns/service/lib/index.ts +++ b/src/plugins/data/server/index_patterns/fetcher/lib/index.ts @@ -17,8 +17,6 @@ * under the License. */ -export { getFieldCapabilities } from './field_capabilities'; -// @ts-ignore +export { getFieldCapabilities, shouldReadFieldFromDocValues } from './field_capabilities'; export { resolveTimePattern } from './resolve_time_pattern'; -// @ts-ignore export { createNoMatchingIndicesError } from './errors'; diff --git a/src/legacy/server/index_patterns/service/lib/resolve_time_pattern.test.js b/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.test.js similarity index 100% rename from src/legacy/server/index_patterns/service/lib/resolve_time_pattern.test.js rename to src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.test.js diff --git a/src/legacy/server/index_patterns/service/lib/resolve_time_pattern.ts b/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts similarity index 100% rename from src/legacy/server/index_patterns/service/lib/resolve_time_pattern.ts rename to src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts diff --git a/src/legacy/server/index_patterns/service/lib/time_pattern_to_wildcard.test.ts b/src/plugins/data/server/index_patterns/fetcher/lib/time_pattern_to_wildcard.test.ts similarity index 100% rename from src/legacy/server/index_patterns/service/lib/time_pattern_to_wildcard.test.ts rename to src/plugins/data/server/index_patterns/fetcher/lib/time_pattern_to_wildcard.test.ts diff --git a/src/legacy/server/index_patterns/service/lib/time_pattern_to_wildcard.ts b/src/plugins/data/server/index_patterns/fetcher/lib/time_pattern_to_wildcard.ts similarity index 100% rename from src/legacy/server/index_patterns/service/lib/time_pattern_to_wildcard.ts rename to src/plugins/data/server/index_patterns/fetcher/lib/time_pattern_to_wildcard.ts diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.mocks.ts b/src/plugins/data/server/index_patterns/index.ts similarity index 83% rename from src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.mocks.ts rename to src/plugins/data/server/index_patterns/index.ts index 04c99a1547ba9..6937fa22c4e5d 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.mocks.ts +++ b/src/plugins/data/server/index_patterns/index.ts @@ -17,10 +17,5 @@ * under the License. */ -export const settingsGet = jest.fn(); - -jest.doMock('ui/chrome', () => ({ - getUiSettingsClient: () => ({ - get: settingsGet, - }), -})); +export { IndexPatternsFetcher, FieldDescriptor, shouldReadFieldFromDocValues } from './fetcher'; +export { IndexPatternsService } from './index_patterns_service'; diff --git a/packages/kbn-es-query/src/filters/query.js b/src/plugins/data/server/index_patterns/index_patterns_service.ts similarity index 72% rename from packages/kbn-es-query/src/filters/query.js rename to src/plugins/data/server/index_patterns/index_patterns_service.ts index ded877231bf67..30d199c0e522e 100644 --- a/packages/kbn-es-query/src/filters/query.js +++ b/src/plugins/data/server/index_patterns/index_patterns_service.ts @@ -17,18 +17,14 @@ * under the License. */ -// Creates a filter corresponding to a raw Elasticsearch query DSL object -export function buildQueryFilter(query, index, alias) { - const filter = { - query: query, - meta: { - index, - } - }; +import { CoreSetup } from 'kibana/server'; +import { Plugin } from '../../../../core/server'; +import { registerRoutes } from './routes'; - if (alias) { - filter.meta.alias = alias; +export class IndexPatternsService implements Plugin { + public setup({ http, elasticsearch }: CoreSetup) { + registerRoutes(http, elasticsearch); } - return filter; + public start() {} } diff --git a/src/legacy/server/index_patterns/routes.ts b/src/plugins/data/server/index_patterns/routes.ts similarity index 90% rename from src/legacy/server/index_patterns/routes.ts rename to src/plugins/data/server/index_patterns/routes.ts index fb78b94e0f77f..7975e923e219b 100644 --- a/src/legacy/server/index_patterns/routes.ts +++ b/src/plugins/data/server/index_patterns/routes.ts @@ -25,18 +25,18 @@ import { RequestHandlerContext, APICaller, CallAPIOptions, -} from '../../../core/server'; -import { IndexPatternsService } from './service'; +} from '../../../../core/server'; +import { IndexPatternsFetcher } from './fetcher'; -export function registerRoutes(core: CoreSetup) { - const getIndexPatternsService = async (request: KibanaRequest): Promise => { - const client = await core.elasticsearch.dataClient$.pipe(first()).toPromise(); +export function registerRoutes(http: CoreSetup['http'], elasticsearch: CoreSetup['elasticsearch']) { + const getIndexPatternsService = async (request: KibanaRequest): Promise => { + const client = await elasticsearch.dataClient$.pipe(first()).toPromise(); const callCluster: APICaller = ( endpoint: string, params?: Record, options?: CallAPIOptions ) => client.asScoped(request).callAsCurrentUser(endpoint, params, options); - return new Promise(resolve => resolve(new IndexPatternsService(callCluster))); + return new Promise(resolve => resolve(new IndexPatternsFetcher(callCluster))); }; const parseMetaFields = (metaFields: string | string[]) => { @@ -49,7 +49,7 @@ export function registerRoutes(core: CoreSetup) { return parsedFields; }; - const router = core.http.createRouter(); + const router = http.createRouter(); router.get( { path: '/api/index_patterns/_fields_for_wildcard', diff --git a/src/plugins/data/server/plugin.ts b/src/plugins/data/server/plugin.ts index 9cf08b0702e9e..e81250e653ebd 100644 --- a/src/plugins/data/server/plugin.ts +++ b/src/plugins/data/server/plugin.ts @@ -18,19 +18,21 @@ */ import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/server'; +import { IndexPatternsService } from './index_patterns'; import { ISearchSetup } from './search'; import { SearchService } from './search/search_service'; export interface DataPluginSetup { search: ISearchSetup; } - export class DataServerPlugin implements Plugin { private readonly searchService: SearchService; + private readonly indexPatterns = new IndexPatternsService(); constructor(initializerContext: PluginInitializerContext) { this.searchService = new SearchService(initializerContext); } public setup(core: CoreSetup) { + this.indexPatterns.setup(core); return { search: this.searchService.setup(core), }; diff --git a/src/plugins/embeddable/public/_index.scss b/src/plugins/embeddable/public/_index.scss new file mode 100644 index 0000000000000..ed80b3f9983e5 --- /dev/null +++ b/src/plugins/embeddable/public/_index.scss @@ -0,0 +1,3 @@ +@import './variables'; +@import './lib/panel/index'; +@import './lib/panel/panel_header/index'; diff --git a/src/legacy/core_plugins/embeddable_api/public/_variables.scss b/src/plugins/embeddable/public/_variables.scss similarity index 100% rename from src/legacy/core_plugins/embeddable_api/public/_variables.scss rename to src/plugins/embeddable/public/_variables.scss diff --git a/src/plugins/embeddable/public/lib/actions/apply_filter_action.ts b/src/plugins/embeddable/public/lib/actions/apply_filter_action.ts index 99cfb2ea13d07..e2592b70397f3 100644 --- a/src/plugins/embeddable/public/lib/actions/apply_filter_action.ts +++ b/src/plugins/embeddable/public/lib/actions/apply_filter_action.ts @@ -18,16 +18,16 @@ */ import { i18n } from '@kbn/i18n'; -import { Filter } from '@kbn/es-query'; import { IAction, createAction, IncompatibleActionError } from '../ui_actions'; import { IEmbeddable, EmbeddableInput } from '../embeddables'; +import { esFilters } from '../../../../../plugins/data/public'; export const APPLY_FILTER_ACTION = 'APPLY_FILTER_ACTION'; -type RootEmbeddable = IEmbeddable; +type RootEmbeddable = IEmbeddable; interface ActionContext { embeddable: IEmbeddable; - filters: Filter[]; + filters: esFilters.Filter[]; } async function isCompatible(context: ActionContext) { diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx index 802be5bf1282e..47113ffc59561 100644 --- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx +++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx @@ -20,7 +20,6 @@ import { ViewMode, EmbeddableOutput, isErrorEmbeddable } from '../../../../'; import { AddPanelAction } from './add_panel_action'; import { EmbeddableFactory } from '../../../../embeddables'; -import { Filter, FilterStateStore } from '@kbn/es-query'; import { FILTERABLE_EMBEDDABLE, FilterableEmbeddable, @@ -32,6 +31,7 @@ import { GetEmbeddableFactory } from '../../../../types'; // eslint-disable-next-line import { coreMock } from '../../../../../../../../core/public/mocks'; import { ContactCardEmbeddable } from '../../../../test_samples'; +import { esFilters } from '../../../../../../../../plugins/data/public'; const embeddableFactories = new Map(); embeddableFactories.set(FILTERABLE_EMBEDDABLE, new FilterableEmbeddableFactory()); @@ -51,8 +51,8 @@ beforeEach(async () => { () => null ); - const derivedFilter: Filter = { - $state: { store: FilterStateStore.APP_STATE }, + const derivedFilter: esFilters.Filter = { + $state: { store: esFilters.FilterStateStore.APP_STATE }, meta: { disabled: false, alias: 'name', negate: false }, query: { match: {} }, }; diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx index 550f9706a634b..8d9beec940acc 100644 --- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx +++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx @@ -28,7 +28,6 @@ import { } from '../../../test_samples'; // eslint-disable-next-line import { inspectorPluginMock } from 'src/plugins/inspector/public/mocks'; -import { FilterStateStore } from '@kbn/es-query'; import { EmbeddableFactory, EmbeddableOutput, @@ -37,6 +36,7 @@ import { } from '../../../embeddables'; import { GetEmbeddableFactory } from '../../../types'; import { of } from '../../../../tests/helpers'; +import { esFilters } from '../../../../../../../plugins/data/public'; const setup = async () => { const embeddableFactories = new Map(); @@ -48,7 +48,7 @@ const setup = async () => { panels: {}, filters: [ { - $state: { store: FilterStateStore.APP_STATE }, + $state: { store: esFilters.FilterStateStore.APP_STATE }, meta: { disabled: false, alias: 'name', negate: false }, query: { match: {} }, }, diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx index 22e3be89f1ae9..684a8c45a4e89 100644 --- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx +++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx @@ -17,7 +17,6 @@ * under the License. */ -import { Filter, FilterStateStore } from '@kbn/es-query'; import { EmbeddableOutput, isErrorEmbeddable } from '../../../'; import { RemovePanelAction } from './remove_panel_action'; import { EmbeddableFactory } from '../../../embeddables'; @@ -30,6 +29,7 @@ import { FilterableEmbeddableFactory } from '../../../test_samples/embeddables/f import { FilterableContainer } from '../../../test_samples/embeddables/filterable_container'; import { GetEmbeddableFactory, ViewMode } from '../../../types'; import { ContactCardEmbeddable } from '../../../test_samples/embeddables/contact_card/contact_card_embeddable'; +import { esFilters } from '../../../../../../../plugins/data/public'; const embeddableFactories = new Map(); embeddableFactories.set(FILTERABLE_EMBEDDABLE, new FilterableEmbeddableFactory()); @@ -39,8 +39,8 @@ let container: FilterableContainer; let embeddable: FilterableEmbeddable; beforeEach(async () => { - const derivedFilter: Filter = { - $state: { store: FilterStateStore.APP_STATE }, + const derivedFilter: esFilters.Filter = { + $state: { store: esFilters.FilterStateStore.APP_STATE }, meta: { disabled: false, alias: 'name', negate: false }, query: { match: {} }, }; diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_container.tsx b/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_container.tsx index eaef8048a6fbf..de708b778c3c7 100644 --- a/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_container.tsx +++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_container.tsx @@ -16,14 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -import { Filter } from '@kbn/es-query'; + import { Container, ContainerInput } from '../../containers'; import { GetEmbeddableFactory } from '../../types'; +import { esFilters } from '../../../../../data/public'; export const FILTERABLE_CONTAINER = 'FILTERABLE_CONTAINER'; export interface FilterableContainerInput extends ContainerInput { - filters: Filter[]; + filters: esFilters.Filter[]; } /** @@ -33,7 +34,7 @@ export interface FilterableContainerInput extends ContainerInput { */ // eslint-disable-next-line @typescript-eslint/consistent-type-definitions export type InheritedChildrenInput = { - filters: Filter[]; + filters: esFilters.Filter[]; id?: string; }; diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_embeddable.tsx b/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_embeddable.tsx index f6885ca25b437..56aa7688f37a6 100644 --- a/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_embeddable.tsx +++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_embeddable.tsx @@ -17,14 +17,14 @@ * under the License. */ -import { Filter } from '@kbn/es-query'; import { IContainer } from '../../containers'; import { EmbeddableOutput, EmbeddableInput, Embeddable } from '../../embeddables'; +import { esFilters } from '../../../../../data/public'; export const FILTERABLE_EMBEDDABLE = 'FILTERABLE_EMBEDDABLE'; export interface FilterableEmbeddableInput extends EmbeddableInput { - filters: Filter[]; + filters: esFilters.Filter[]; } export class FilterableEmbeddable extends Embeddable { diff --git a/src/plugins/embeddable/public/tests/apply_filter_action.test.ts b/src/plugins/embeddable/public/tests/apply_filter_action.test.ts index 52500acc3dc59..0721acb1a1fba 100644 --- a/src/plugins/embeddable/public/tests/apply_filter_action.test.ts +++ b/src/plugins/embeddable/public/tests/apply_filter_action.test.ts @@ -32,7 +32,7 @@ import { } from '../lib/test_samples'; // eslint-disable-next-line import { inspectorPluginMock } from 'src/plugins/inspector/public/mocks'; -import { FilterStateStore } from '@kbn/es-query'; +import { esFilters } from '../../../../plugins/data/public'; test('ApplyFilterAction applies the filter to the root of the container tree', async () => { const { doStart } = testPlugin(); @@ -76,7 +76,7 @@ test('ApplyFilterAction applies the filter to the root of the container tree', a } const filter: any = { - $state: { store: FilterStateStore.APP_STATE }, + $state: { store: esFilters.FilterStateStore.APP_STATE }, meta: { disabled: false, negate: false, diff --git a/src/plugins/embeddable/public/tests/container.test.ts b/src/plugins/embeddable/public/tests/container.test.ts index 3bdbcbad857d6..f97c26a41b901 100644 --- a/src/plugins/embeddable/public/tests/container.test.ts +++ b/src/plugins/embeddable/public/tests/container.test.ts @@ -26,7 +26,6 @@ import { FILTERABLE_EMBEDDABLE, } from '../lib/test_samples/embeddables/filterable_embeddable'; import { ERROR_EMBEDDABLE_TYPE } from '../lib/embeddables/error_embeddable'; -import { Filter, FilterStateStore } from '@kbn/es-query'; import { FilterableEmbeddableFactory } from '../lib/test_samples/embeddables/filterable_embeddable_factory'; import { CONTACT_CARD_EMBEDDABLE } from '../lib/test_samples/embeddables/contact_card/contact_card_embeddable_factory'; import { SlowContactCardEmbeddableFactory } from '../lib/test_samples/embeddables/contact_card/slow_contact_card_embeddable_factory'; @@ -46,6 +45,7 @@ import { import { coreMock } from '../../../../core/public/mocks'; import { testPlugin } from './test_plugin'; import { of } from './helpers'; +import { esFilters } from '../../../../plugins/data/public'; async function creatHelloWorldContainerAndEmbeddable( containerInput: ContainerInput = { id: 'hello', panels: {} }, @@ -437,8 +437,8 @@ test('Test nested reactions', async done => { test('Explicit embeddable input mapped to undefined will default to inherited', async () => { const { start } = await creatHelloWorldContainerAndEmbeddable(); - const derivedFilter: Filter = { - $state: { store: FilterStateStore.APP_STATE }, + const derivedFilter: esFilters.Filter = { + $state: { store: esFilters.FilterStateStore.APP_STATE }, meta: { disabled: false, alias: 'name', negate: false }, query: { match: {} }, }; diff --git a/src/plugins/embeddable/public/tests/explicit_input.test.ts b/src/plugins/embeddable/public/tests/explicit_input.test.ts index 6cde7bdc48ba1..47c4b0944cef2 100644 --- a/src/plugins/embeddable/public/tests/explicit_input.test.ts +++ b/src/plugins/embeddable/public/tests/explicit_input.test.ts @@ -18,7 +18,6 @@ */ import { skip } from 'rxjs/operators'; -import { Filter, FilterStateStore } from '@kbn/es-query'; import { testPlugin } from './test_plugin'; import { FILTERABLE_EMBEDDABLE, @@ -34,6 +33,7 @@ import { isErrorEmbeddable } from '../lib'; import { HelloWorldContainer } from '../lib/test_samples/embeddables/hello_world_container'; // eslint-disable-next-line import { coreMock } from '../../../../core/public/mocks'; +import { esFilters } from '../../../../plugins/data/public'; const { setup, doStart, coreStart, uiActions } = testPlugin( coreMock.createSetup(), @@ -50,8 +50,8 @@ setup.registerEmbeddableFactory(CONTACT_CARD_EMBEDDABLE, factory); setup.registerEmbeddableFactory(HELLO_WORLD_EMBEDDABLE_TYPE, new HelloWorldEmbeddableFactory()); test('Explicit embeddable input mapped to undefined will default to inherited', async () => { - const derivedFilter: Filter = { - $state: { store: FilterStateStore.APP_STATE }, + const derivedFilter: esFilters.Filter = { + $state: { store: esFilters.FilterStateStore.APP_STATE }, meta: { disabled: false, alias: 'name', negate: false }, query: { match: {} }, }; diff --git a/src/plugins/expressions/kibana.json b/src/plugins/expressions/kibana.json index ce2b1854cf415..ec87b56f3745e 100644 --- a/src/plugins/expressions/kibana.json +++ b/src/plugins/expressions/kibana.json @@ -2,5 +2,8 @@ "id": "expressions", "version": "kibana", "server": false, - "ui": true + "ui": true, + "requiredPlugins": [ + "inspector" + ] } diff --git a/src/plugins/expressions/common/expressions/create_error.ts b/src/plugins/expressions/public/create_error.ts similarity index 100% rename from src/plugins/expressions/common/expressions/create_error.ts rename to src/plugins/expressions/public/create_error.ts diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable_api.ts b/src/plugins/expressions/public/create_handlers.ts similarity index 90% rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable_api.ts rename to src/plugins/expressions/public/create_handlers.ts index 17911b908d3b3..46e85411c5895 100644 --- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable_api.ts +++ b/src/plugins/expressions/public/create_handlers.ts @@ -17,4 +17,8 @@ * under the License. */ -export * from '../../../../../embeddable_api/public/np_ready/public'; +export function createHandlers() { + return { + environment: 'client', + }; +} diff --git a/src/plugins/expressions/common/expressions/expression_types/boolean.ts b/src/plugins/expressions/public/expression_types/boolean.ts similarity index 100% rename from src/plugins/expressions/common/expressions/expression_types/boolean.ts rename to src/plugins/expressions/public/expression_types/boolean.ts diff --git a/src/plugins/expressions/common/expressions/expression_types/datatable.ts b/src/plugins/expressions/public/expression_types/datatable.ts similarity index 100% rename from src/plugins/expressions/common/expressions/expression_types/datatable.ts rename to src/plugins/expressions/public/expression_types/datatable.ts diff --git a/src/plugins/expressions/common/expressions/expression_types/error.ts b/src/plugins/expressions/public/expression_types/error.ts similarity index 100% rename from src/plugins/expressions/common/expressions/expression_types/error.ts rename to src/plugins/expressions/public/expression_types/error.ts diff --git a/src/plugins/expressions/common/expressions/expression_types/filter.ts b/src/plugins/expressions/public/expression_types/filter.ts similarity index 100% rename from src/plugins/expressions/common/expressions/expression_types/filter.ts rename to src/plugins/expressions/public/expression_types/filter.ts diff --git a/src/plugins/expressions/common/expressions/expression_types/image.ts b/src/plugins/expressions/public/expression_types/image.ts similarity index 100% rename from src/plugins/expressions/common/expressions/expression_types/image.ts rename to src/plugins/expressions/public/expression_types/image.ts diff --git a/src/plugins/expressions/common/expressions/expression_types/index.ts b/src/plugins/expressions/public/expression_types/index.ts similarity index 93% rename from src/plugins/expressions/common/expressions/expression_types/index.ts rename to src/plugins/expressions/public/expression_types/index.ts index bb8a554487f01..a5d182fee75ed 100644 --- a/src/plugins/expressions/common/expressions/expression_types/index.ts +++ b/src/plugins/expressions/public/expression_types/index.ts @@ -22,6 +22,8 @@ import { datatable } from './datatable'; import { error } from './error'; import { filter } from './filter'; import { image } from './image'; +import { kibanaContext } from './kibana_context'; +import { kibanaDatatable } from './kibana_datatable'; import { nullType } from './null'; import { number } from './number'; import { pointseries } from './pointseries'; @@ -30,8 +32,6 @@ import { render } from './render'; import { shape } from './shape'; import { string } from './string'; import { style } from './style'; -import { kibanaContext } from './kibana_context'; -import { kibanaDatatable } from './kibana_datatable'; export const typeSpecs = [ boolean, @@ -39,26 +39,30 @@ export const typeSpecs = [ error, filter, image, - number, + kibanaContext, + kibanaDatatable, nullType, + number, pointseries, range, render, shape, string, style, - kibanaContext, - kibanaDatatable, ]; -// Types +export * from './boolean'; export * from './datatable'; export * from './error'; export * from './filter'; export * from './image'; export * from './kibana_context'; export * from './kibana_datatable'; +export * from './null'; +export * from './number'; export * from './pointseries'; +export * from './range'; export * from './render'; +export * from './shape'; +export * from './string'; export * from './style'; -export * from './range'; diff --git a/src/plugins/expressions/common/expressions/expression_types/kibana_context.ts b/src/plugins/expressions/public/expression_types/kibana_context.ts similarity index 90% rename from src/plugins/expressions/common/expressions/expression_types/kibana_context.ts rename to src/plugins/expressions/public/expression_types/kibana_context.ts index 174517abc2c05..bcf8e2853dec8 100644 --- a/src/plugins/expressions/common/expressions/expression_types/kibana_context.ts +++ b/src/plugins/expressions/public/expression_types/kibana_context.ts @@ -17,8 +17,7 @@ * under the License. */ -import { Filter } from '@kbn/es-query'; -import { TimeRange, Query } from 'src/plugins/data/public'; +import { TimeRange, Query, esFilters } from 'src/plugins/data/public'; const name = 'kibana_context'; export type KIBANA_CONTEXT_NAME = 'kibana_context'; @@ -26,7 +25,7 @@ export type KIBANA_CONTEXT_NAME = 'kibana_context'; export interface KibanaContext { type: typeof name; query?: Query | Query[]; - filters?: Filter[]; + filters?: esFilters.Filter[]; timeRange?: TimeRange; } diff --git a/src/plugins/expressions/common/expressions/expression_types/kibana_datatable.ts b/src/plugins/expressions/public/expression_types/kibana_datatable.ts similarity index 97% rename from src/plugins/expressions/common/expressions/expression_types/kibana_datatable.ts rename to src/plugins/expressions/public/expression_types/kibana_datatable.ts index 7f77e226ff1d9..c360a2be8c7f7 100644 --- a/src/plugins/expressions/common/expressions/expression_types/kibana_datatable.ts +++ b/src/plugins/expressions/public/expression_types/kibana_datatable.ts @@ -19,7 +19,7 @@ import { map } from 'lodash'; import { SerializedFieldFormat } from '../types/common'; -import { Datatable, PointSeries } from '../types'; +import { Datatable, PointSeries } from '.'; const name = 'kibana_datatable'; diff --git a/src/plugins/expressions/common/expressions/expression_types/null.ts b/src/plugins/expressions/public/expression_types/null.ts similarity index 100% rename from src/plugins/expressions/common/expressions/expression_types/null.ts rename to src/plugins/expressions/public/expression_types/null.ts diff --git a/src/plugins/expressions/common/expressions/expression_types/number.ts b/src/plugins/expressions/public/expression_types/number.ts similarity index 100% rename from src/plugins/expressions/common/expressions/expression_types/number.ts rename to src/plugins/expressions/public/expression_types/number.ts diff --git a/src/plugins/expressions/common/expressions/expression_types/pointseries.ts b/src/plugins/expressions/public/expression_types/pointseries.ts similarity index 100% rename from src/plugins/expressions/common/expressions/expression_types/pointseries.ts rename to src/plugins/expressions/public/expression_types/pointseries.ts diff --git a/src/plugins/expressions/common/expressions/expression_types/range.ts b/src/plugins/expressions/public/expression_types/range.ts similarity index 94% rename from src/plugins/expressions/common/expressions/expression_types/range.ts rename to src/plugins/expressions/public/expression_types/range.ts index c1a0e4d2075fa..082056c909988 100644 --- a/src/plugins/expressions/common/expressions/expression_types/range.ts +++ b/src/plugins/expressions/public/expression_types/range.ts @@ -17,7 +17,8 @@ * under the License. */ -import { ExpressionType, Render } from '../../../common/expressions/types'; +import { ExpressionType } from '../types'; +import { Render } from '.'; const name = 'range'; diff --git a/src/plugins/expressions/common/expressions/expression_types/render.ts b/src/plugins/expressions/public/expression_types/render.ts similarity index 100% rename from src/plugins/expressions/common/expressions/expression_types/render.ts rename to src/plugins/expressions/public/expression_types/render.ts diff --git a/src/plugins/expressions/common/expressions/expression_types/shape.ts b/src/plugins/expressions/public/expression_types/shape.ts similarity index 100% rename from src/plugins/expressions/common/expressions/expression_types/shape.ts rename to src/plugins/expressions/public/expression_types/shape.ts diff --git a/src/plugins/expressions/common/expressions/expression_types/string.ts b/src/plugins/expressions/public/expression_types/string.ts similarity index 100% rename from src/plugins/expressions/common/expressions/expression_types/string.ts rename to src/plugins/expressions/public/expression_types/string.ts diff --git a/src/plugins/expressions/common/expressions/expression_types/style.ts b/src/plugins/expressions/public/expression_types/style.ts similarity index 83% rename from src/plugins/expressions/common/expressions/expression_types/style.ts rename to src/plugins/expressions/public/expression_types/style.ts index f6ef0f1fe42e6..d93893d25c11c 100644 --- a/src/plugins/expressions/common/expressions/expression_types/style.ts +++ b/src/plugins/expressions/public/expression_types/style.ts @@ -17,17 +17,11 @@ * under the License. */ -import { ExpressionType } from '../types'; +import { ExpressionType, ExpressionTypeStyle } from '../types'; const name = 'style'; -export interface Style { - type: typeof name; - spec: any; - css: string; -} - -export const style = (): ExpressionType => ({ +export const style = (): ExpressionType => ({ name, from: { null: () => { diff --git a/src/plugins/expressions/public/expressions/expressions_service.ts b/src/plugins/expressions/public/expressions/expressions_service.ts deleted file mode 100644 index 4b6820143b794..0000000000000 --- a/src/plugins/expressions/public/expressions/expressions_service.ts +++ /dev/null @@ -1,69 +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 { FunctionsRegistry, RenderFunctionsRegistry, TypesRegistry } from './interpreter'; -import { AnyExpressionType, AnyExpressionFunction } from '../../common/expressions/types'; - -export interface ExpressionsSetupContract { - registerFunction: (fn: () => AnyExpressionFunction) => void; - registerRenderer: (renderer: any) => void; - registerType: (type: () => AnyExpressionType) => void; - __LEGACY: { - functions: FunctionsRegistry; - renderers: RenderFunctionsRegistry; - types: TypesRegistry; - }; -} - -export type ExpressionsStartContract = ExpressionsSetupContract; - -export class ExpressionsService { - private readonly functions = new FunctionsRegistry(); - private readonly renderers = new RenderFunctionsRegistry(); - private readonly types = new TypesRegistry(); - - private setupApi!: ExpressionsSetupContract; - - public setup() { - const { functions, renderers, types } = this; - - this.setupApi = { - registerFunction: fn => { - this.functions.register(fn); - }, - registerRenderer: (renderer: any) => { - this.renderers.register(renderer); - }, - registerType: type => { - this.types.register(type); - }, - __LEGACY: { - functions, - renderers, - types, - }, - }; - - return this.setupApi; - } - - public start(): ExpressionsStartContract { - return this.setupApi as ExpressionsStartContract; - } -} diff --git a/src/plugins/expressions/public/expressions/interpreter.ts b/src/plugins/expressions/public/expressions/interpreter.ts deleted file mode 100644 index f27ef57c7980a..0000000000000 --- a/src/plugins/expressions/public/expressions/interpreter.ts +++ /dev/null @@ -1,173 +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. - */ - -/** - * @todo - * This whole file needs major refactoring. `Registry` class does not do anything - * useful. "Wrappers" like `RenderFunction` basically just set default props on the objects. - */ - -/* eslint-disable max-classes-per-file */ -import { clone, mapValues, includes } from 'lodash'; -import { Type } from '../../common/expressions/interpreter'; -import { ExpressionType, AnyExpressionFunction } from '../../common/expressions/types'; - -export class Registry { - _prop: string; - _indexed: any; - - constructor(prop: string = 'name') { - if (typeof prop !== 'string') throw new Error('Registry property name must be a string'); - this._prop = prop; - this._indexed = new Object(); - } - - wrapper(obj: ItemSpec) { - return obj; - } - - register(fn: () => ItemSpec) { - if (typeof fn !== 'function') throw new Error(`Register requires an function`); - - const obj = fn() as any; - - if (typeof obj !== 'object' || !obj[this._prop]) { - throw new Error(`Registered functions must return an object with a ${this._prop} property`); - } - - this._indexed[obj[this._prop].toLowerCase()] = this.wrapper(obj); - } - - toJS(): Record { - return Object.keys(this._indexed).reduce( - (acc, key) => { - acc[key] = this.get(key); - return acc; - }, - {} as any - ); - } - - toArray(): Item[] { - return Object.keys(this._indexed).map(key => this.get(key)!); - } - - get(name: string): Item | null { - if (name === undefined) { - return null; - } - const lowerCaseName = name.toLowerCase(); - return this._indexed[lowerCaseName] ? clone(this._indexed[lowerCaseName]) : null; - } - - getProp(): string { - return this._prop; - } - - reset() { - this._indexed = new Object(); - } -} - -function RenderFunction(this: any, config: any) { - // This must match the name of the function that is used to create the `type: render` object - this.name = config.name; - - // Use this to set a more friendly name - this.displayName = config.displayName || this.name; - - // A sentence or few about what this element does - this.help = config.help; - - // used to validate the data before calling the render function - this.validate = config.validate || function validate() {}; - - // tell the renderer if the dom node should be reused, it's recreated each time by default - this.reuseDomNode = Boolean(config.reuseDomNode); - - // the function called to render the data - this.render = - config.render || - function render(domNode: any, data: any, done: any) { - done(); - }; -} - -export function Arg(this: any, config: any) { - 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.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: any) => { - if (!this.types.length) return true; - return includes(config.types, type); - }; -} - -export function Fn(this: any, config: any) { - // Required - this.name = config.name; // Name of function - - // Return type of function. - // This SHOULD be supplied. We use it for UI and autocomplete hinting, - // We may also use it for optimizations in the future. - this.type = config.type; - this.aliases = config.aliases || []; - - // Function to run function (context, args) - this.fn = (...args: any) => Promise.resolve(config.fn(...args)); - - // Optional - this.help = config.help || ''; // A short help text - this.args = mapValues( - config.args || {}, - (arg: any, name: any) => new (Arg as any)({ name, ...arg }) - ); - - this.context = config.context || {}; - - this.accepts = (type: any) => { - if (!this.context.types) return true; // If you don't tell us about context, we'll assume you don't care what you get - return includes(this.context.types, type); // Otherwise, check it - }; -} - -export class RenderFunctionsRegistry extends Registry { - wrapper(obj: any) { - return new (RenderFunction as any)(obj); - } -} - -export class FunctionsRegistry extends Registry { - wrapper(obj: any) { - return new (Fn as any)(obj); - } -} - -export class TypesRegistry extends Registry, any> { - wrapper(obj: any) { - return new (Type as any)(obj); - } -} diff --git a/src/plugins/expressions/public/fonts.ts b/src/plugins/expressions/public/fonts.ts new file mode 100644 index 0000000000000..cdf3d4c16f3b5 --- /dev/null +++ b/src/plugins/expressions/public/fonts.ts @@ -0,0 +1,151 @@ +/* + * 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 type contains a unions of all supported font labels, or the the name of + * the font the user would see in a UI. + */ +export type FontLabel = typeof fonts[number]['label']; + +/** + * This type contains a union of all supported font values, equivalent to the CSS + * `font-value` property. + */ +export type FontValue = typeof fonts[number]['value']; + +/** + * An interface representing a font in Canvas, with a textual label and the CSS + * `font-value`. + */ +export interface Font { + label: FontLabel; + value: FontValue; +} + +// This function allows one to create a strongly-typed font for inclusion in +// the font collection. As a result, the values and labels are known to the +// type system, preventing one from specifying a non-existent font at build +// time. +function createFont< + RawFont extends { value: RawFontValue; label: RawFontLabel }, + RawFontValue extends string, + RawFontLabel extends string +>(font: RawFont) { + return font; +} + +export const americanTypewriter = createFont({ + label: 'American Typewriter', + value: "'American Typewriter', 'Courier New', Courier, Monaco, mono", +}); + +export const arial = createFont({ label: 'Arial', value: 'Arial, sans-serif' }); + +export const baskerville = createFont({ + label: 'Baskerville', + value: "Baskerville, Georgia, Garamond, 'Times New Roman', Times, serif", +}); + +export const bookAntiqua = createFont({ + label: 'Book Antiqua', + value: "'Book Antiqua', Georgia, Garamond, 'Times New Roman', Times, serif", +}); + +export const brushScript = createFont({ + label: 'Brush Script', + value: "'Brush Script MT', 'Comic Sans', sans-serif", +}); + +export const chalkboard = createFont({ + label: 'Chalkboard', + value: "Chalkboard, 'Comic Sans', sans-serif", +}); + +export const didot = createFont({ + label: 'Didot', + value: "Didot, Georgia, Garamond, 'Times New Roman', Times, serif", +}); + +export const futura = createFont({ + label: 'Futura', + value: 'Futura, Impact, Helvetica, Arial, sans-serif', +}); + +export const gillSans = createFont({ + label: 'Gill Sans', + value: + "'Gill Sans', 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Helvetica, Arial, sans-serif", +}); + +export const helveticaNeue = createFont({ + label: 'Helvetica Neue', + value: "'Helvetica Neue', Helvetica, Arial, sans-serif", +}); + +export const hoeflerText = createFont({ + label: 'Hoefler Text', + value: "'Hoefler Text', Garamond, Georgia, 'Times New Roman', Times, serif", +}); + +export const lucidaGrande = createFont({ + label: 'Lucida Grande', + value: "'Lucida Grande', 'Lucida Sans Unicode', Lucida, Verdana, Helvetica, Arial, sans-serif", +}); + +export const myriad = createFont({ + label: 'Myriad', + value: 'Myriad, Helvetica, Arial, sans-serif', +}); + +export const openSans = createFont({ + label: 'Open Sans', + value: "'Open Sans', Helvetica, Arial, sans-serif", +}); + +export const optima = createFont({ + label: 'Optima', + value: "Optima, 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Helvetica, Arial, sans-serif", +}); + +export const palatino = createFont({ + label: 'Palatino', + value: "Palatino, 'Book Antiqua', Georgia, Garamond, 'Times New Roman', Times, serif", +}); + +/** + * A collection of supported fonts. + */ +export const fonts = [ + americanTypewriter, + arial, + baskerville, + bookAntiqua, + brushScript, + chalkboard, + didot, + futura, + gillSans, + helveticaNeue, + hoeflerText, + lucidaGrande, + myriad, + openSans, + optima, + palatino, +]; diff --git a/src/plugins/expressions/public/functions/clog.ts b/src/plugins/expressions/public/functions/clog.ts new file mode 100644 index 0000000000000..929075b882b96 --- /dev/null +++ b/src/plugins/expressions/public/functions/clog.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 { ExpressionFunction } from '../types'; + +const name = 'clog'; + +type Context = any; +type ClogExpressionFunction = ExpressionFunction; + +export const clog = (): ClogExpressionFunction => ({ + name, + args: {}, + help: 'Outputs the context to the console', + fn: context => { + console.log(context); // eslint-disable-line no-console + return context; + }, +}); diff --git a/src/plugins/expressions/public/functions/font.ts b/src/plugins/expressions/public/functions/font.ts new file mode 100644 index 0000000000000..33e28924f3ee1 --- /dev/null +++ b/src/plugins/expressions/public/functions/font.ts @@ -0,0 +1,186 @@ +/* + * 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 { openSans, FontLabel as FontFamily } from '../fonts'; +import { ExpressionFunction } from '../types'; +import { CSSStyle, FontStyle, FontWeight, Style, TextAlignment, TextDecoration } from '../types'; + +const dashify = (str: string) => { + return str + .trim() + .replace(/([a-z])([A-Z])/g, '$1-$2') + .replace(/\W/g, m => (/[À-ž]/.test(m) ? m : '-')) + .replace(/^-+|-+$/g, '') + .toLowerCase(); +}; + +const inlineStyle = (obj: Record) => { + if (!obj) return ''; + const styles = Object.keys(obj).map(key => { + const prop = dashify(key); + const line = prop.concat(':').concat(String(obj[key])); + return line; + }); + return styles.join(';'); +}; + +interface Arguments { + align?: TextAlignment; + color?: string; + family?: FontFamily; + italic?: boolean; + lHeight?: number | null; + size?: number; + underline?: boolean; + weight?: FontWeight; +} + +export function font(): ExpressionFunction<'font', null, Arguments, Style> { + return { + name: 'font', + aliases: [], + type: 'style', + help: i18n.translate('expressions_np.functions.fontHelpText', { + defaultMessage: 'Create a font style.', + }), + context: { + types: ['null'], + }, + args: { + align: { + default: 'left', + help: i18n.translate('expressions_np.functions.font.args.alignHelpText', { + defaultMessage: 'The horizontal text alignment.', + }), + options: Object.values(TextAlignment), + types: ['string'], + }, + color: { + help: i18n.translate('expressions_np.functions.font.args.colorHelpText', { + defaultMessage: 'The text color.', + }), + types: ['string'], + }, + family: { + default: `"${openSans.value}"`, + help: i18n.translate('expressions_np.functions.font.args.familyHelpText', { + defaultMessage: 'An acceptable {css} web font string', + values: { + css: 'CSS', + }, + }), + types: ['string'], + }, + italic: { + default: false, + help: i18n.translate('expressions_np.functions.font.args.italicHelpText', { + defaultMessage: 'Italicize the text?', + }), + options: [true, false], + types: ['boolean'], + }, + lHeight: { + default: null, + aliases: ['lineHeight'], + help: i18n.translate('expressions_np.functions.font.args.lHeightHelpText', { + defaultMessage: 'The line height in pixels', + }), + types: ['number', 'null'], + }, + size: { + default: 14, + help: i18n.translate('expressions_np.functions.font.args.sizeHelpText', { + defaultMessage: 'The font size in pixels', + }), + types: ['number'], + }, + underline: { + default: false, + help: i18n.translate('expressions_np.functions.font.args.underlineHelpText', { + defaultMessage: 'Underline the text?', + }), + options: [true, false], + types: ['boolean'], + }, + weight: { + default: 'normal', + help: i18n.translate('expressions_np.functions.font.args.weightHelpText', { + defaultMessage: 'The font weight. For example, {list}, or {end}.', + values: { + list: Object.values(FontWeight) + .slice(0, -1) + .map(weight => `\`"${weight}"\``) + .join(', '), + end: `\`"${Object.values(FontWeight).slice(-1)[0]}"\``, + }, + }), + options: Object.values(FontWeight), + types: ['string'], + }, + }, + fn: (_context, args) => { + if (!Object.values(FontWeight).includes(args.weight!)) { + throw new Error( + i18n.translate('expressions_np.functions.font.invalidFontWeightErrorMessage', { + defaultMessage: "Invalid font weight: '{weight}'", + values: { + weight: args.weight, + }, + }) + ); + } + if (!Object.values(TextAlignment).includes(args.align!)) { + throw new Error( + i18n.translate('expressions_np.functions.font.invalidTextAlignmentErrorMessage', { + defaultMessage: "Invalid text alignment: '{align}'", + values: { + align: args.align, + }, + }) + ); + } + + // the line height shouldn't ever be lower than the size, and apply as a + // pixel setting + const lineHeight = args.lHeight != null ? `${args.lHeight}px` : '1'; + + const spec: CSSStyle = { + fontFamily: args.family, + fontWeight: args.weight, + fontStyle: args.italic ? FontStyle.ITALIC : FontStyle.NORMAL, + textDecoration: args.underline ? TextDecoration.UNDERLINE : TextDecoration.NONE, + textAlign: args.align, + fontSize: `${args.size}px`, // apply font size as a pixel setting + lineHeight, // apply line height as a pixel setting + }; + + // conditionally apply styles based on input + if (args.color) { + spec.color = args.color; + } + + return { + type: 'style', + spec, + css: inlineStyle(spec as Record), + }; + }, + }; +} diff --git a/src/plugins/expressions/public/functions/kibana.ts b/src/plugins/expressions/public/functions/kibana.ts new file mode 100644 index 0000000000000..7ed9619675aea --- /dev/null +++ b/src/plugins/expressions/public/functions/kibana.ts @@ -0,0 +1,64 @@ +/* + * 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 { ExpressionFunction } from '../types'; +import { KibanaContext } from '../expression_types'; + +export type ExpressionFunctionKibana = ExpressionFunction< + 'kibana', + KibanaContext | null, + object, + KibanaContext +>; + +export const kibana = (): ExpressionFunctionKibana => ({ + name: 'kibana', + type: 'kibana_context', + + context: { + types: ['kibana_context', 'null'], + }, + + help: i18n.translate('expressions_np.functions.kibana.help', { + defaultMessage: 'Gets kibana global context', + }), + args: {}, + fn(context, args, handlers) { + const initialContext = handlers.getInitialContext ? handlers.getInitialContext() : {}; + + if (context && context.query) { + initialContext.query = initialContext.query.concat(context.query); + } + + if (context && context.filters) { + initialContext.filters = initialContext.filters.concat(context.filters); + } + + const timeRange = initialContext.timeRange || (context ? context.timeRange : undefined); + + return { + ...context, + type: 'kibana_context', + query: initialContext.query, + filters: initialContext.filters, + timeRange, + }; + }, +}); diff --git a/src/legacy/core_plugins/interpreter/public/functions/kibana_context.ts b/src/plugins/expressions/public/functions/kibana_context.ts similarity index 74% rename from src/legacy/core_plugins/interpreter/public/functions/kibana_context.ts rename to src/plugins/expressions/public/functions/kibana_context.ts index 1ba7b450c5409..2a0cd09734b6d 100644 --- a/src/legacy/core_plugins/interpreter/public/functions/kibana_context.ts +++ b/src/plugins/expressions/public/functions/kibana_context.ts @@ -17,9 +17,10 @@ * under the License. */ -import chrome from 'ui/chrome'; import { i18n } from '@kbn/i18n'; -import { ExpressionFunction, KibanaContext } from '../../types'; +import { ExpressionFunction } from '../types'; +import { KibanaContext } from '../expression_types'; +import { savedObjects } from '../services'; interface Arguments { q?: string | null; @@ -41,7 +42,7 @@ export const kibanaContext = (): ExpressionFunctionKibanaContext => ({ context: { types: ['kibana_context', 'null'], }, - help: i18n.translate('interpreter.functions.kibana_context.help', { + help: i18n.translate('expressions_np.functions.kibana_context.help', { defaultMessage: 'Updates kibana global context', }), args: { @@ -49,45 +50,43 @@ export const kibanaContext = (): ExpressionFunctionKibanaContext => ({ types: ['string', 'null'], aliases: ['query', '_'], default: null, - help: i18n.translate('interpreter.functions.kibana_context.q.help', { + help: i18n.translate('expressions_np.functions.kibana_context.q.help', { defaultMessage: 'Specify Kibana free form text query', }), }, filters: { types: ['string', 'null'], default: '"[]"', - help: i18n.translate('interpreter.functions.kibana_context.filters.help', { + help: i18n.translate('expressions_np.functions.kibana_context.filters.help', { defaultMessage: 'Specify Kibana generic filters', }), }, timeRange: { types: ['string', 'null'], default: null, - help: i18n.translate('interpreter.functions.kibana_context.timeRange.help', { + help: i18n.translate('expressions_np.functions.kibana_context.timeRange.help', { defaultMessage: 'Specify Kibana time range filter', }), }, savedSearchId: { types: ['string', 'null'], default: null, - help: i18n.translate('interpreter.functions.kibana_context.savedSearchId.help', { + help: i18n.translate('expressions_np.functions.kibana_context.savedSearchId.help', { defaultMessage: 'Specify saved search ID to be used for queries and filters', }), }, }, async fn(context, args, handlers) { - const $injector = await chrome.dangerouslyGetActiveInjector(); - const savedSearches = $injector.get('savedSearches') as any; const queryArg = args.q ? JSON.parse(args.q) : []; let queries = Array.isArray(queryArg) ? queryArg : [queryArg]; let filters = args.filters ? JSON.parse(args.filters) : []; if (args.savedSearchId) { - const savedSearch = await savedSearches.get(args.savedSearchId); - const searchQuery = savedSearch.searchSource.getField('query'); - const searchFilters = savedSearch.searchSource.getField('filter'); - queries = queries.concat(searchQuery); - filters = filters.concat(searchFilters); + const obj = await savedObjects.get('search', args.savedSearchId); + const search = obj.attributes.kibanaSavedObjectMeta as { searchSourceJSON: string }; + const data = JSON.parse(search.searchSourceJSON) as { query: string; filter: any[] }; + queries = queries.concat(data.query); + filters = filters.concat(data.filter); } if (context && context.query) { diff --git a/src/legacy/core_plugins/interpreter/public/functions/__snapshots__/kibana.test.ts.snap b/src/plugins/expressions/public/functions/tests/__snapshots__/kibana.test.ts.snap similarity index 100% rename from src/legacy/core_plugins/interpreter/public/functions/__snapshots__/kibana.test.ts.snap rename to src/plugins/expressions/public/functions/tests/__snapshots__/kibana.test.ts.snap diff --git a/src/legacy/core_plugins/interpreter/public/functions/font.test.ts b/src/plugins/expressions/public/functions/tests/font.test.ts similarity index 97% rename from src/legacy/core_plugins/interpreter/public/functions/font.test.ts rename to src/plugins/expressions/public/functions/tests/font.test.ts index 7032e042a59ea..a0397b920f905 100644 --- a/src/legacy/core_plugins/interpreter/public/functions/font.test.ts +++ b/src/plugins/expressions/public/functions/tests/font.test.ts @@ -17,9 +17,9 @@ * under the License. */ -import { openSans } from '../../common/lib/fonts'; -import { font } from './font'; -import { functionWrapper } from '../../test_helpers'; +import { openSans } from '../../fonts'; +import { font } from '../font'; +import { functionWrapper } from './utils'; describe('font', () => { const fn = functionWrapper(font); diff --git a/src/legacy/core_plugins/interpreter/public/functions/kibana.test.ts b/src/plugins/expressions/public/functions/tests/kibana.test.ts similarity index 93% rename from src/legacy/core_plugins/interpreter/public/functions/kibana.test.ts rename to src/plugins/expressions/public/functions/tests/kibana.test.ts index cd67825b534cd..d9489d724cc70 100644 --- a/src/legacy/core_plugins/interpreter/public/functions/kibana.test.ts +++ b/src/plugins/expressions/public/functions/tests/kibana.test.ts @@ -17,9 +17,10 @@ * under the License. */ -import { functionWrapper } from '../../test_helpers'; -import { kibana } from './kibana'; -import { KibanaContext, FunctionHandlers } from '../../types'; +import { functionWrapper } from './utils'; +import { kibana } from '../kibana'; +import { FunctionHandlers } from '../../types'; +import { KibanaContext } from '../../expression_types'; describe('interpreter/functions#kibana', () => { const fn = functionWrapper(kibana); diff --git a/src/plugins/expressions/public/functions/tests/utils.ts b/src/plugins/expressions/public/functions/tests/utils.ts new file mode 100644 index 0000000000000..5eb9c1a0d6390 --- /dev/null +++ b/src/plugins/expressions/public/functions/tests/utils.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 { mapValues } from 'lodash'; +import { AnyExpressionFunction, FunctionHandlers } from '../../types'; + +// Takes a function spec and passes in default args, +// overriding with any provided args. +export const functionWrapper = (fnSpec: () => T) => { + const spec = fnSpec(); + const defaultArgs = mapValues(spec.args, argSpec => argSpec.default); + return ( + context: object | null, + args: Record = {}, + handlers: FunctionHandlers = {} + ) => spec.fn(context, { ...defaultArgs, ...args }, handlers); +}; diff --git a/src/plugins/expressions/public/index.ts b/src/plugins/expressions/public/index.ts index 21f89db140e5a..84ad2550fda0a 100644 --- a/src/plugins/expressions/public/index.ts +++ b/src/plugins/expressions/public/index.ts @@ -26,4 +26,9 @@ export function plugin(initializerContext: PluginInitializerContext) { export { ExpressionsPublicPlugin as Plugin }; -export * from '../common'; +export * from './plugin'; +export * from './types'; +export { Type, getType } from './interpreter'; +export { interpreterProvider, ExpressionInterpret } from './interpreter_provider'; +export * from './serialize_provider'; +export * from './expression_types'; diff --git a/src/plugins/expressions/common/expressions/serialize_provider.test.ts b/src/plugins/expressions/public/interpreter.test.ts similarity index 97% rename from src/plugins/expressions/common/expressions/serialize_provider.test.ts rename to src/plugins/expressions/public/interpreter.test.ts index 774fb34938dd2..42443a2c32b82 100644 --- a/src/plugins/expressions/common/expressions/serialize_provider.test.ts +++ b/src/plugins/expressions/public/interpreter.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { getType } from './serialize_provider'; +import { getType } from './interpreter'; describe('getType()', () => { test('returns "null" string for null or undefined', () => { diff --git a/src/plugins/expressions/common/expressions/interpreter.ts b/src/plugins/expressions/public/interpreter.ts similarity index 50% rename from src/plugins/expressions/common/expressions/interpreter.ts rename to src/plugins/expressions/public/interpreter.ts index 07146b6eb3181..13bf245f233cb 100644 --- a/src/plugins/expressions/common/expressions/interpreter.ts +++ b/src/plugins/expressions/public/interpreter.ts @@ -18,8 +18,10 @@ */ import { get } from 'lodash'; +import { AnyExpressionType } from './types'; +import { ExpressionValue } from './types/types'; -function getType(node: any) { +export function getType(node: any) { if (node == null) return 'null'; if (typeof node === 'object') { if (!node.type) throw new Error('Objects must have a type property'); @@ -28,30 +30,48 @@ function getType(node: any) { return typeof node; } -export function Type(this: any, config: any) { - // Required - this.name = config.name; +export class Type { + name: string; - // Optional - this.help = config.help || ''; // A short help text + /** + * A short help text. + */ + help: string; - // Optional type validation, useful for checking function output - this.validate = config.validate || function validate() {}; + /** + * Type validation, useful for checking function output. + */ + validate: (type: any) => void | Error; - // Optional - this.create = config.create; + create: unknown; - // Optional serialization (used when passing context around client/server) - this.serialize = config.serialize; - this.deserialize = config.deserialize; + /** + * Optional serialization (used when passing context around client/server). + */ + serialize?: (value: ExpressionValue) => any; + deserialize?: (serialized: any) => ExpressionValue; - const getToFn = (type: any) => get(config, ['to', type]) || get(config, ['to', '*']); - const getFromFn = (type: any) => get(config, ['from', type]) || get(config, ['from', '*']); + constructor(private readonly config: AnyExpressionType) { + const { name, help, deserialize, serialize, validate } = config; - this.castsTo = (type: any) => typeof getToFn(type) === 'function'; - this.castsFrom = (type: any) => typeof getFromFn(type) === 'function'; + this.name = name; + this.help = help || ''; + this.validate = validate || (() => {}); - this.to = (node: any, toTypeName: any, types: any) => { + // Optional + this.create = (config as any).create; + + this.serialize = serialize; + this.deserialize = deserialize; + } + + getToFn = (value: any) => get(this.config, ['to', value]) || get(this.config, ['to', '*']); + getFromFn = (value: any) => get(this.config, ['from', value]) || get(this.config, ['from', '*']); + + castsTo = (value: any) => typeof this.getToFn(value) === 'function'; + castsFrom = (value: any) => typeof this.getFromFn(value) === 'function'; + + to = (node: any, toTypeName: any, types: any) => { const typeName = getType(node); if (typeName !== this.name) { throw new Error(`Can not cast object of type '${typeName}' using '${this.name}'`); @@ -59,13 +79,13 @@ export function Type(this: any, config: any) { throw new Error(`Can not cast '${typeName}' to '${toTypeName}'`); } - return (getToFn(toTypeName) as any)(node, types); + return (this.getToFn(toTypeName) as any)(node, types); }; - this.from = (node: any, types: any) => { + from = (node: any, types: any) => { const typeName = getType(node); if (!this.castsFrom(typeName)) throw new Error(`Can not cast '${this.name}' from ${typeName}`); - return (getFromFn(typeName) as any)(node, types); + return (this.getFromFn(typeName) as any)(node, types); }; } diff --git a/src/plugins/expressions/common/expressions/interpreter_provider.ts b/src/plugins/expressions/public/interpreter_provider.ts similarity index 88% rename from src/plugins/expressions/common/expressions/interpreter_provider.ts rename to src/plugins/expressions/public/interpreter_provider.ts index 59ba1085a9d7d..cb84370ad69c5 100644 --- a/src/plugins/expressions/common/expressions/interpreter_provider.ts +++ b/src/plugins/expressions/public/interpreter_provider.ts @@ -21,11 +21,11 @@ import { clone, each, keys, last, mapValues, reduce, zipObject } from 'lodash'; // @ts-ignore -import { fromExpression, getByAlias, castProvider } from '@kbn/interpreter/common'; +import { fromExpression, getByAlias } from '@kbn/interpreter/common'; import { createError } from './create_error'; import { ExpressionAST, ExpressionFunctionAST, AnyExpressionFunction, ArgumentType } from './types'; -import { getType } from '../../common'; +import { getType } from './interpreter'; export { createError }; @@ -40,7 +40,30 @@ export type ExpressionInterpret = (ast: ExpressionAST, context?: any) => any; export function interpreterProvider(config: InterpreterConfig): ExpressionInterpret { const { functions, types } = config; const handlers = { ...config.handlers, types }; - const cast = castProvider(types); + + function cast(node: any, toTypeNames: any) { + // If you don't give us anything to cast to, you'll get your input back + if (!toTypeNames || toTypeNames.length === 0) return node; + + // No need to cast if node is already one of the valid types + const fromTypeName = getType(node); + if (toTypeNames.includes(fromTypeName)) return node; + + const fromTypeDef = types[fromTypeName]; + + for (let i = 0; i < toTypeNames.length; i++) { + // First check if the current type can cast to this type + if (fromTypeDef && fromTypeDef.castsTo(toTypeNames[i])) { + return fromTypeDef.to(node, toTypeNames[i], types); + } + + // If that isn't possible, check if this type can cast from the current type + const toTypeDef = types[toTypeNames[i]]; + if (toTypeDef && toTypeDef.castsFrom(fromTypeName)) return toTypeDef.from(node, types); + } + + throw new Error(`Can not cast '${fromTypeName}' to any of '${toTypeNames.join(', ')}'`); + } async function invokeChain(chainArr: ExpressionFunctionAST[], context: any): Promise { if (!chainArr.length) return context; diff --git a/src/plugins/expressions/public/mocks.ts b/src/plugins/expressions/public/mocks.ts index 56ff343e70ac4..9b47aa2b0cd97 100644 --- a/src/plugins/expressions/public/mocks.ts +++ b/src/plugins/expressions/public/mocks.ts @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -import { Plugin } from '.'; +import { ExpressionsSetup, ExpressionsStart } from '.'; -export type Setup = jest.Mocked>; -export type Start = jest.Mocked>; +export type Setup = jest.Mocked; +export type Start = jest.Mocked; const createSetupContract = (): Setup => { const setupContract: Setup = { @@ -36,28 +36,18 @@ const createSetupContract = (): Setup => { types: { register: () => {}, } as any, + getExecutor: () => ({ + interpreter: { + interpretAst: () => {}, + }, + }), }, }; return setupContract; }; const createStartContract = (): Start => { - const startContract: Start = { - registerFunction: jest.fn(), - registerRenderer: jest.fn(), - registerType: jest.fn(), - __LEGACY: { - functions: { - register: () => {}, - } as any, - renderers: { - register: () => {}, - } as any, - types: { - register: () => {}, - } as any, - }, - }; + const startContract: Start = undefined; return startContract; }; diff --git a/src/plugins/expressions/public/plugin.ts b/src/plugins/expressions/public/plugin.ts index b301981f58801..e67b503f301aa 100644 --- a/src/plugins/expressions/public/plugin.ts +++ b/src/plugins/expressions/public/plugin.ts @@ -19,29 +19,133 @@ import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public'; import { - ExpressionsService, - ExpressionsSetupContract, - ExpressionsStartContract, -} from './expressions/expressions_service'; + AnyExpressionFunction, + AnyExpressionType, + ExpressionInterpretWithHandlers, + ExpressionExecutor, +} from './types'; +import { FunctionsRegistry, RenderFunctionsRegistry, TypesRegistry } from './registries'; +import { Setup as InspectorSetup, Start as InspectorStart } from '../../inspector/public'; +import { setCoreStart } from './services'; +import { clog as clogFunction } from './functions/clog'; +import { font as fontFunction } from './functions/font'; +import { kibana as kibanaFunction } from './functions/kibana'; +import { kibanaContext as kibanaContextFunction } from './functions/kibana_context'; +import { + boolean as booleanType, + datatable as datatableType, + error as errorType, + filter as filterType, + image as imageType, + nullType, + number as numberType, + pointseries, + range as rangeType, + render as renderType, + shape as shapeType, + string as stringType, + style as styleType, + kibanaContext as kibanaContextType, + kibanaDatatable as kibanaDatatableType, +} from './expression_types'; +import { interpreterProvider } from './interpreter_provider'; +import { createHandlers } from './create_handlers'; + +export interface ExpressionsSetupDeps { + inspector: InspectorSetup; +} + +export interface ExpressionsStartDeps { + inspector: InspectorStart; +} + +export interface ExpressionsSetup { + registerFunction: (fn: AnyExpressionFunction | (() => AnyExpressionFunction)) => void; + registerRenderer: (renderer: any) => void; + registerType: (type: () => AnyExpressionType) => void; + __LEGACY: { + functions: FunctionsRegistry; + renderers: RenderFunctionsRegistry; + types: TypesRegistry; + getExecutor: () => ExpressionExecutor; + }; +} + +export type ExpressionsStart = void; export class ExpressionsPublicPlugin - implements Plugin<{}, {}, ExpressionsSetupContract, ExpressionsStartContract> { - private readonly expressions = new ExpressionsService(); + implements + Plugin { + private readonly functions = new FunctionsRegistry(); + private readonly renderers = new RenderFunctionsRegistry(); + private readonly types = new TypesRegistry(); constructor(initializerContext: PluginInitializerContext) {} - public setup(core: CoreSetup): ExpressionsSetupContract { - const expressions = this.expressions.setup(); - return { - ...expressions, + public setup(core: CoreSetup, { inspector }: ExpressionsSetupDeps): ExpressionsSetup { + const { functions, renderers, types } = this; + + const registerFunction: ExpressionsSetup['registerFunction'] = fn => { + functions.register(fn); + }; + + registerFunction(clogFunction); + registerFunction(fontFunction); + registerFunction(kibanaFunction); + registerFunction(kibanaContextFunction); + + types.register(booleanType); + types.register(datatableType); + types.register(errorType); + types.register(filterType); + types.register(imageType); + types.register(nullType); + types.register(numberType); + types.register(pointseries); + types.register(rangeType); + types.register(renderType); + types.register(shapeType); + types.register(stringType); + types.register(styleType); + types.register(kibanaContextType); + types.register(kibanaDatatableType); + + // TODO: Refactor this function. + const getExecutor = () => { + const interpretAst: ExpressionInterpretWithHandlers = (ast, context, handlers) => { + const interpret = interpreterProvider({ + types: types.toJS(), + handlers: { ...handlers, ...createHandlers() }, + functions: functions.toJS(), + }); + return interpret(ast, context); + }; + const executor: ExpressionExecutor = { interpreter: { interpretAst } }; + return executor; }; - } - public start(core: CoreStart): ExpressionsStartContract { - const expressions = this.expressions.start(); - return { - ...expressions, + const setup: ExpressionsSetup = { + registerFunction, + registerRenderer: (renderer: any) => { + renderers.register(renderer); + }, + registerType: type => { + types.register(type); + }, + __LEGACY: { + functions, + renderers, + types, + getExecutor, + }, }; + + return setup; + } + + public start(core: CoreStart, { inspector }: ExpressionsStartDeps): ExpressionsStart { + setCoreStart(core); } + public stop() {} } diff --git a/src/plugins/expressions/public/registries/function_registry.ts b/src/plugins/expressions/public/registries/function_registry.ts new file mode 100644 index 0000000000000..c15b7ceb0d217 --- /dev/null +++ b/src/plugins/expressions/public/registries/function_registry.ts @@ -0,0 +1,127 @@ +/* + * 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. + */ + +/* eslint-disable max-classes-per-file */ + +import { AnyExpressionFunction, FunctionHandlers } from '../types/functions'; +import { ExpressionValue } from '../types/types'; +import { ArgumentType } from '../types'; +import { Registry } from './registry'; + +export class FunctionParameter { + name: string; + required: boolean; + help: string; + types: string[]; + default: any; + aliases: string[]; + multi: boolean; + resolve: boolean; + options: any[]; + + constructor(name: string, arg: ArgumentType) { + const { required, help, types, aliases, multi, resolve, options } = arg; + + if (name === '_') { + throw Error('Arg names must not be _. Use it in aliases instead.'); + } + + this.name = name; + this.required = !!required; + this.help = help || ''; + this.types = types || []; + this.default = arg.default; + this.aliases = aliases || []; + this.multi = !!multi; + this.resolve = resolve == null ? true : resolve; + this.options = options || []; + } + + accepts(type: string) { + if (!this.types.length) return true; + return this.types.indexOf(type) > -1; + } +} + +export class Function { + /** + * Name of function + */ + name: string; + + /** + * Aliases that can be used instead of `name`. + */ + aliases: string[]; + + /** + * Return type of function. This SHOULD be supplied. We use it for UI + * and autocomplete hinting. We may also use it for optimizations in + * the future. + */ + type: string; + + /** + * Function to run function (context, args) + */ + fn: ( + input: ExpressionValue, + params: Record, + handlers: FunctionHandlers + ) => ExpressionValue; + + /** + * A short help text. + */ + help: string; + + args: Record = {}; + + context: { types?: string[] }; + + constructor(functionDefinition: AnyExpressionFunction) { + const { name, type, aliases, fn, help, args, context } = functionDefinition; + + this.name = name; + this.type = type; + this.aliases = aliases || []; + this.fn = (input, params, handlers) => Promise.resolve(fn(input, params, handlers)); + this.help = help || ''; + this.context = context || {}; + + for (const [key, arg] of Object.entries(args || {})) { + this.args[key] = new FunctionParameter(key, arg); + } + } + + accepts = (type: string): boolean => { + // If you don't tell us about context, we'll assume you don't care what you get. + if (!this.context.types) return true; + return this.context.types.indexOf(type) > -1; + }; +} + +export class FunctionsRegistry extends Registry { + register(functionDefinition: AnyExpressionFunction | (() => AnyExpressionFunction)) { + const fn = new Function( + typeof functionDefinition === 'object' ? functionDefinition : functionDefinition() + ); + this.set(fn.name, fn); + } +} diff --git a/src/plugins/expressions/public/registries/index.ts b/src/plugins/expressions/public/registries/index.ts new file mode 100644 index 0000000000000..16c8d8fc4c93a --- /dev/null +++ b/src/plugins/expressions/public/registries/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 * from './type_registry'; +export * from './function_registry'; +export * from './render_registry'; diff --git a/src/plugins/expressions/public/registries/registry.ts b/src/plugins/expressions/public/registries/registry.ts new file mode 100644 index 0000000000000..fe149116fbf14 --- /dev/null +++ b/src/plugins/expressions/public/registries/registry.ts @@ -0,0 +1,42 @@ +/* + * 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 Registry { + private data: Record = {}; + + set(id: string, item: T) { + this.data[id] = item; + } + + get(id: string): T | null { + return this.data[id] || null; + } + + toJS(): Record { + return { ...this.data }; + } + + toArray(): T[] { + return Object.values(this.data); + } + + reset() { + this.data = {}; + } +} diff --git a/src/plugins/expressions/public/registries/render_registry.ts b/src/plugins/expressions/public/registries/render_registry.ts new file mode 100644 index 0000000000000..6fd48f5f0c6af --- /dev/null +++ b/src/plugins/expressions/public/registries/render_registry.ts @@ -0,0 +1,83 @@ +/* + * 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. + */ + +/* eslint-disable max-classes-per-file */ + +import { Registry } from './registry'; + +export interface ExpressionRenderDefinition { + name: string; + displayName: string; + help?: string; + validate?: () => void | Error; + reuseDomNode: boolean; + render: (domNode: HTMLElement, config: Config, handlers: any) => Promise; +} + +class ExpressionRenderFunction { + /** + * This must match the name of the function that is used to create the `type: render` object. + */ + name: string; + + /** + * Use this to set a more friendly name. + */ + displayName: string; + + /** + * A sentence or few about what this element does. + */ + help: string; + + /** + * Used to validate the data before calling the render function. + */ + validate: () => void | Error; + + /** + * Tell the renderer if the dom node should be reused, it's recreated each time by default. + */ + reuseDomNode: boolean; + + /** + * The function called to render the data. + */ + render: (domNode: HTMLElement, config: any, handlers: any) => Promise; + + constructor(config: ExpressionRenderDefinition) { + const { name, displayName, help, validate, reuseDomNode, render } = config; + + this.name = name; + this.displayName = displayName || name; + this.help = help || ''; + this.validate = validate || (() => {}); + this.reuseDomNode = Boolean(reuseDomNode); + this.render = render; + } +} + +export class RenderFunctionsRegistry extends Registry { + register(definition: ExpressionRenderDefinition | (() => ExpressionRenderDefinition)) { + const renderFunction = new ExpressionRenderFunction( + typeof definition === 'object' ? definition : definition() + ); + this.set(renderFunction.name, renderFunction); + } +} diff --git a/src/plugins/expressions/public/registries/type_registry.ts b/src/plugins/expressions/public/registries/type_registry.ts new file mode 100644 index 0000000000000..bcc801213582e --- /dev/null +++ b/src/plugins/expressions/public/registries/type_registry.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 { Registry } from './registry'; +import { Type } from '../interpreter'; +import { AnyExpressionType } from '../types'; + +export class TypesRegistry extends Registry { + register(typeDefinition: AnyExpressionType | (() => AnyExpressionType)) { + const type = new Type(typeof typeDefinition === 'object' ? typeDefinition : typeDefinition()); + this.set(type.name, type); + } +} diff --git a/src/plugins/expressions/common/expressions/serialize_provider.ts b/src/plugins/expressions/public/serialize_provider.ts similarity index 84% rename from src/plugins/expressions/common/expressions/serialize_provider.ts rename to src/plugins/expressions/public/serialize_provider.ts index 1bd06a38a2560..449d47c183dbb 100644 --- a/src/plugins/expressions/common/expressions/serialize_provider.ts +++ b/src/plugins/expressions/public/serialize_provider.ts @@ -18,15 +18,7 @@ */ import { get, identity } from 'lodash'; - -export function getType(node: any) { - if (node == null) return 'null'; - if (typeof node === 'object') { - if (!node.type) throw new Error('Objects must have a type property'); - return node.type; - } - return typeof node; -} +import { getType } from './interpreter'; export function serializeProvider(types: any) { return { diff --git a/src/legacy/core_plugins/data/public/shim/legacy_dependencies_plugin.ts b/src/plugins/expressions/public/services.ts similarity index 54% rename from src/legacy/core_plugins/data/public/shim/legacy_dependencies_plugin.ts rename to src/plugins/expressions/public/services.ts index 83d276fe9ba74..a1a42aa85e670 100644 --- a/src/legacy/core_plugins/data/public/shim/legacy_dependencies_plugin.ts +++ b/src/plugins/expressions/public/services.ts @@ -17,28 +17,19 @@ * under the License. */ -import { Storage } from 'ui/storage'; -import { Plugin } from '../../../../../../src/core/public'; +import { createKibanaUtilsCore, createGetterSetter } from '../../kibana_utils/public'; +import { ExpressionInterpreter } from './types'; +import { Start as IInspector } from '../../inspector/public'; +import { ExpressionsSetup } from './plugin'; -/** @internal */ -export interface LegacyDependenciesPluginSetup { - storage: Storage; -} +export const { getCoreStart, setCoreStart, savedObjects } = createKibanaUtilsCore(); -export interface LegacyDependenciesPluginStart { - storage: Storage; -} +export const [getInspector, setInspector] = createGetterSetter('Inspector'); -export class LegacyDependenciesPlugin implements Plugin { - public setup() { - return { - storage: new Storage(window.localStorage), - } as LegacyDependenciesPluginSetup; - } +export const [getInterpreter, setInterpreter] = createGetterSetter( + 'Interpreter' +); - public start() { - return { - storage: new Storage(window.localStorage), - } as LegacyDependenciesPluginStart; - } -} +export const [getRenderersRegistry, setRenderersRegistry] = createGetterSetter< + ExpressionsSetup['__LEGACY']['renderers'] +>('Renderers registry'); diff --git a/src/plugins/expressions/common/expressions/types/arguments.ts b/src/plugins/expressions/public/types/arguments.ts similarity index 100% rename from src/plugins/expressions/common/expressions/types/arguments.ts rename to src/plugins/expressions/public/types/arguments.ts diff --git a/src/plugins/expressions/common/expressions/types/common.ts b/src/plugins/expressions/public/types/common.ts similarity index 100% rename from src/plugins/expressions/common/expressions/types/common.ts rename to src/plugins/expressions/public/types/common.ts diff --git a/src/plugins/expressions/common/expressions/types/functions.ts b/src/plugins/expressions/public/types/functions.ts similarity index 100% rename from src/plugins/expressions/common/expressions/types/functions.ts rename to src/plugins/expressions/public/types/functions.ts diff --git a/src/plugins/expressions/public/types/index.ts b/src/plugins/expressions/public/types/index.ts new file mode 100644 index 0000000000000..2d66216a9770b --- /dev/null +++ b/src/plugins/expressions/public/types/index.ts @@ -0,0 +1,142 @@ +/* + * 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 { ExpressionInterpret } from '../interpreter_provider'; +import { TimeRange } from '../../../data/public'; +import { Adapters } from '../../../inspector/public'; +import { Query } from '../../../data/public'; +import { ExpressionAST } from '../../../expressions/public'; +import { ExpressionArgAST } from '../../../../plugins/expressions/public'; +import { esFilters } from '../../../../plugins/data/public'; + +export { ArgumentType } from './arguments'; +export { + TypeToString, + KnownTypeToString, + TypeString, + UnmappedTypeStrings, + UnwrapPromise, + SerializedFieldFormat, +} from './common'; + +export { ExpressionFunction, AnyExpressionFunction, FunctionHandlers } from './functions'; +export { ExpressionType, AnyExpressionType } from './types'; + +export * from './style'; + +export type ExpressionArgAST = string | boolean | number | ExpressionAST; + +export interface ExpressionFunctionAST { + type: 'function'; + function: string; + arguments: { + [key: string]: ExpressionArgAST[]; + }; +} + +export interface ExpressionAST { + type: 'expression'; + chain: ExpressionFunctionAST[]; +} + +export type ExpressionInterpretWithHandlers = ( + ast: Parameters[0], + context: Parameters[1], + handlers: IInterpreterHandlers +) => ReturnType; + +export interface ExpressionInterpreter { + interpretAst: ExpressionInterpretWithHandlers; +} + +export interface ExpressionExecutor { + interpreter: ExpressionInterpreter; +} + +export type RenderId = number; +export type Data = any; +export type event = any; +export type Context = object; + +export interface SearchContext { + type: 'kibana_context'; + filters?: esFilters.Filter[]; + query?: Query; + timeRange?: TimeRange; +} + +export type IGetInitialContext = () => SearchContext | Context; + +export interface IExpressionLoaderParams { + searchContext?: SearchContext; + context?: Context; + variables?: Record; + disableCaching?: boolean; + customFunctions?: []; + customRenderers?: []; + extraHandlers?: Record; +} + +export interface IInterpreterHandlers { + getInitialContext: IGetInitialContext; + inspectorAdapters?: Adapters; + abortSignal?: AbortSignal; +} + +export interface IInterpreterRenderHandlers { + /** + * Done increments the number of rendering successes + */ + done: () => void; + onDestroy: (fn: () => void) => void; + reload: () => void; + update: (params: any) => void; + event: (event: event) => void; +} + +export interface IInterpreterRenderFunction { + name: string; + displayName: string; + help: string; + validate: () => void; + reuseDomNode: boolean; + render: (domNode: Element, data: T, handlers: IInterpreterRenderHandlers) => void | Promise; +} + +export interface IInterpreterErrorResult { + type: 'error'; + error: { message: string; name: string; stack: string }; +} + +export interface IInterpreterSuccessResult { + type: string; + as?: string; + value?: unknown; + error?: unknown; +} + +export type IInterpreterResult = IInterpreterSuccessResult & IInterpreterErrorResult; + +export interface IInterpreter { + interpretAst( + ast: ExpressionAST, + context: Context, + handlers: IInterpreterHandlers + ): Promise; +} diff --git a/src/plugins/expressions/public/types/style.ts b/src/plugins/expressions/public/types/style.ts new file mode 100644 index 0000000000000..9f919223d558c --- /dev/null +++ b/src/plugins/expressions/public/types/style.ts @@ -0,0 +1,137 @@ +/* + * 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 { FontLabel } from '../fonts'; + +/** + * Enum of supported CSS `background-repeat` properties. + */ +export enum BackgroundRepeat { + REPEAT = 'repeat', + REPEAT_NO = 'no-repeat', + REPEAT_X = 'repeat-x', + REPEAT_Y = 'repeat-y', + ROUND = 'round', + SPACE = 'space', +} + +/** + * Enum of supported CSS `background-size` properties. + */ +export enum BackgroundSize { + AUTO = 'auto', + CONTAIN = 'contain', + COVER = 'cover', +} + +/** + * Enum of supported CSS `font-style` properties. + */ +export enum FontStyle { + ITALIC = 'italic', + NORMAL = 'normal', +} + +/** + * Enum of supported CSS `font-weight` properties. + */ +export enum FontWeight { + NORMAL = 'normal', + BOLD = 'bold', + BOLDER = 'bolder', + LIGHTER = 'lighter', + ONE = '100', + TWO = '200', + THREE = '300', + FOUR = '400', + FIVE = '500', + SIX = '600', + SEVEN = '700', + EIGHT = '800', + NINE = '900', +} + +/** + * Enum of supported CSS `overflow` properties. + */ +export enum Overflow { + AUTO = 'auto', + HIDDEN = 'hidden', + SCROLL = 'scroll', + VISIBLE = 'visible', +} + +/** + * Enum of supported CSS `text-align` properties. + */ +export enum TextAlignment { + CENTER = 'center', + JUSTIFY = 'justify', + LEFT = 'left', + RIGHT = 'right', +} + +/** + * Enum of supported CSS `text-decoration` properties. + */ +export enum TextDecoration { + NONE = 'none', + UNDERLINE = 'underline', +} + +/** + * Represents the various style properties that can be applied to an element. + */ +export interface CSSStyle { + color?: string; + fill?: string; + fontFamily?: FontLabel; + fontSize?: string; + fontStyle?: FontStyle; + fontWeight?: FontWeight; + lineHeight?: number | string; + textAlign?: TextAlignment; + textDecoration?: TextDecoration; +} + +/** + * Represents an object containing style information for a Container. + */ +export interface ContainerStyle { + border: string | null; + borderRadius: string | null; + padding: string | null; + backgroundColor: string | null; + backgroundImage: string | null; + backgroundSize: BackgroundSize; + backgroundRepeat: BackgroundRepeat; + opacity: number | null; + overflow: Overflow; +} + +/** + * An object that represents style information, typically CSS. + */ +export interface ExpressionTypeStyle { + type: 'style'; + spec: CSSStyle; + css: string; +} + +export type Style = ExpressionTypeStyle; diff --git a/src/plugins/expressions/common/expressions/types/types.ts b/src/plugins/expressions/public/types/types.ts similarity index 99% rename from src/plugins/expressions/common/expressions/types/types.ts rename to src/plugins/expressions/public/types/types.ts index 59297e922d313..e7b30d24fa6eb 100644 --- a/src/plugins/expressions/common/expressions/types/types.ts +++ b/src/plugins/expressions/public/types/types.ts @@ -51,6 +51,7 @@ export interface ExpressionType< to?: { [type: string]: ExpressionValueConverter; }; + help?: string; } export type AnyExpressionType = ExpressionType; diff --git a/src/plugins/kibana_react/public/context/context.test.tsx b/src/plugins/kibana_react/public/context/context.test.tsx index d7dce3f69239d..4008daf69f25d 100644 --- a/src/plugins/kibana_react/public/context/context.test.tsx +++ b/src/plugins/kibana_react/public/context/context.test.tsx @@ -21,7 +21,7 @@ import * as React from 'react'; import * as ReactDOM from 'react-dom'; import { context, createKibanaReactContext, useKibana, KibanaContextProvider } from './context'; import { coreMock, overlayServiceMock } from '../../../../core/public/mocks'; -import { CoreStart } from './types'; +import { CoreStart } from '../../../../core/public'; let container: HTMLDivElement | null; diff --git a/src/plugins/kibana_react/public/context/context.tsx b/src/plugins/kibana_react/public/context/context.tsx index 630348017106a..cbae5c4638ca2 100644 --- a/src/plugins/kibana_react/public/context/context.tsx +++ b/src/plugins/kibana_react/public/context/context.tsx @@ -42,11 +42,11 @@ export const useKibana = (): KibanaReactContextValue< export const withKibana = }>( type: React.ComponentType ): React.FC> => { - const enhancedType: React.FC> = (props: Omit) => { + const EnhancedType: React.FC> = (props: Omit) => { const kibana = useKibana(); return React.createElement(type, { ...props, kibana } as Props); }; - return enhancedType; + return EnhancedType; }; export const UseKibana: React.FC<{ @@ -69,7 +69,7 @@ export const createKibanaReactContext = ( const oldValue = useKibana(); const { value: newValue } = useMemo( () => createKibanaReactContext({ ...services, ...oldValue.services, ...newServices }), - Object.keys(services) + [services, oldValue, newServices] ); return createElement(context.Provider as React.ComponentType, { value: newValue, diff --git a/src/plugins/kibana_react/public/context/index.ts b/src/plugins/kibana_react/public/context/index.ts index 444ef343cd7d2..c7c0693a89f2b 100644 --- a/src/plugins/kibana_react/public/context/index.ts +++ b/src/plugins/kibana_react/public/context/index.ts @@ -25,4 +25,4 @@ export { withKibana, UseKibana, } from './context'; -export { KibanaReactContext, KibanaReactContextValue } from './types'; +export { KibanaReactContext, KibanaReactContextValue, KibanaServices } from './types'; diff --git a/src/plugins/kibana_react/public/context/types.ts b/src/plugins/kibana_react/public/context/types.ts index 1906bb808ea87..35e6349bfca87 100644 --- a/src/plugins/kibana_react/public/context/types.ts +++ b/src/plugins/kibana_react/public/context/types.ts @@ -22,8 +22,6 @@ import { CoreStart } from '../../../../core/public'; import { KibanaReactOverlays } from '../overlays'; import { KibanaReactNotifications } from '../notifications'; -export { CoreStart }; - export type KibanaServices = Partial; export interface KibanaReactContextValue { diff --git a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx index 81d514ca4d466..a880d3c6cf87c 100644 --- a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx +++ b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx @@ -24,11 +24,11 @@ import { EuiScreenReaderOnly, keyCodes } from '@elastic/eui'; // @ts-ignore import { KuiButton } from '@kbn/ui-framework/components'; -interface Props { +export interface ExitFullScreenButtonProps { onExitFullScreenMode: () => void; } -class ExitFullScreenButtonUi extends PureComponent { +class ExitFullScreenButtonUi extends PureComponent { public onKeyDown = (e: KeyboardEvent) => { if (e.keyCode === keyCodes.ESCAPE) { this.props.onExitFullScreenMode(); diff --git a/src/plugins/kibana_react/public/exit_full_screen_button/index.tsx b/src/plugins/kibana_react/public/exit_full_screen_button/index.tsx index a965fd776e0c2..130ac1e980eee 100644 --- a/src/plugins/kibana_react/public/exit_full_screen_button/index.tsx +++ b/src/plugins/kibana_react/public/exit_full_screen_button/index.tsx @@ -17,4 +17,4 @@ * under the License. */ -export { ExitFullScreenButton } from './exit_full_screen_button'; +export { ExitFullScreenButton, ExitFullScreenButtonProps } from './exit_full_screen_button'; diff --git a/src/plugins/kibana_react/public/overlays/types.ts b/src/plugins/kibana_react/public/overlays/types.ts index 6a1fb25ca1483..0108d8eaba6cc 100644 --- a/src/plugins/kibana_react/public/overlays/types.ts +++ b/src/plugins/kibana_react/public/overlays/types.ts @@ -18,7 +18,7 @@ */ import * as React from 'react'; -import { CoreStart } from '../context/types'; +import { CoreStart } from '../../../../core/public'; export interface KibanaReactOverlays { openFlyout: ( diff --git a/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx b/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx index fbea5d613f60c..c65d428958767 100644 --- a/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx +++ b/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx @@ -104,7 +104,7 @@ interface SavedObjectFinderInitialPageSize extends BaseSavedObjectFinder { initialPageSize?: 5 | 10 | 15 | 25; fixedPageSize?: undefined; } -type SavedObjectFinderProps = { +export type SavedObjectFinderProps = { savedObjects: CoreStart['savedObjects']; uiSettings: CoreStart['uiSettings']; } & (SavedObjectFinderFixedPage | SavedObjectFinderInitialPageSize); diff --git a/src/plugins/kibana_react/public/ui_settings/use_ui_setting.test.tsx b/src/plugins/kibana_react/public/ui_settings/use_ui_setting.test.tsx index cc2a8c3fbe1fc..0879b0cb3f36a 100644 --- a/src/plugins/kibana_react/public/ui_settings/use_ui_setting.test.tsx +++ b/src/plugins/kibana_react/public/ui_settings/use_ui_setting.test.tsx @@ -106,7 +106,7 @@ describe('useUiSetting', () => { }); describe('useUiSetting$', () => { - const TestConsumer$: React.FC<{ + const TestConsumerX: React.FC<{ setting: string; newValue?: string; }> = ({ setting, newValue = '' }) => { @@ -126,7 +126,7 @@ describe('useUiSetting$', () => { ReactDOM.render( - + , container ); @@ -143,7 +143,7 @@ describe('useUiSetting$', () => { ReactDOM.render( - + , container ); @@ -159,7 +159,7 @@ describe('useUiSetting$', () => { ReactDOM.render( - + , container ); @@ -174,7 +174,7 @@ describe('useUiSetting$', () => { ReactDOM.render( - + , container ); diff --git a/src/plugins/kibana_react/public/ui_settings/use_ui_setting.ts b/src/plugins/kibana_react/public/ui_settings/use_ui_setting.ts index ddc8b2a684728..295515bfa51af 100644 --- a/src/plugins/kibana_react/public/ui_settings/use_ui_setting.ts +++ b/src/plugins/kibana_react/public/ui_settings/use_ui_setting.ts @@ -65,6 +65,7 @@ export const useUiSetting$ = (key: string, defaultValue?: T): [T, Setter] const observable$ = useMemo(() => services.uiSettings!.get$(key, defaultValue), [ key, defaultValue, + services.uiSettings, ]); const value = useObservable(observable$, services.uiSettings!.get(key, defaultValue)); const set = useCallback((newValue: T) => services.uiSettings!.set(key, newValue), [key]); diff --git a/src/plugins/kibana_utils/public/index.ts b/src/plugins/kibana_utils/public/index.ts index 7cb4d4a34e971..3aaa6d28a9f64 100644 --- a/src/plugins/kibana_utils/public/index.ts +++ b/src/plugins/kibana_utils/public/index.ts @@ -18,8 +18,11 @@ */ export * from './core'; +export * from './errors'; export * from './store'; export * from './parse'; export * from './render_complete'; +export * from './store'; export * from './errors'; export * from './field_mapping'; +export * from './storage'; diff --git a/src/legacy/ui/public/storage/__tests__/storage.js b/src/plugins/kibana_utils/public/storage/__tests__/storage.js similarity index 100% rename from src/legacy/ui/public/storage/__tests__/storage.js rename to src/plugins/kibana_utils/public/storage/__tests__/storage.js diff --git a/src/legacy/ui/public/storage/index.ts b/src/plugins/kibana_utils/public/storage/index.ts similarity index 94% rename from src/legacy/ui/public/storage/index.ts rename to src/plugins/kibana_utils/public/storage/index.ts index 17bbb61b2b8d5..53956bf21cdf3 100644 --- a/src/legacy/ui/public/storage/index.ts +++ b/src/plugins/kibana_utils/public/storage/index.ts @@ -17,6 +17,5 @@ * under the License. */ -import './directive'; - export { Storage } from './storage'; +export { IStorage, IStorageWrapper } from './types'; diff --git a/src/legacy/ui/public/storage/storage.ts b/src/plugins/kibana_utils/public/storage/storage.ts similarity index 73% rename from src/legacy/ui/public/storage/storage.ts rename to src/plugins/kibana_utils/public/storage/storage.ts index 703886c1e034c..a7d3c5ac70074 100644 --- a/src/legacy/ui/public/storage/storage.ts +++ b/src/plugins/kibana_utils/public/storage/storage.ts @@ -17,17 +17,12 @@ * under the License. */ -import angular from 'angular'; +import { IStorage, IStorageWrapper } from './types'; -// 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 implements IStorageWrapper { + public store: IStorage; -export class Storage { - public store: WebStorage; - - constructor(store: WebStorage) { + constructor(store: IStorage) { this.store = store; } @@ -50,7 +45,7 @@ export class Storage { public set = (key: string, value: any) => { try { - return this.store.setItem(key, angular.toJson(value)); + return this.store.setItem(key, JSON.stringify(value)); } catch (e) { return false; } diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/stub_index_pattern.ts b/src/plugins/kibana_utils/public/storage/types.ts similarity index 71% rename from src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/stub_index_pattern.ts rename to src/plugins/kibana_utils/public/storage/types.ts index d429fc7f70f38..875bb44bcad17 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/stub_index_pattern.ts +++ b/src/plugins/kibana_utils/public/storage/types.ts @@ -17,12 +17,16 @@ * under the License. */ -export class StubIndexPatterns { - async get(index: string) { - return { - fields: { - getByName: () => undefined, - }, - }; - } +export interface IStorageWrapper { + get: (key: string) => any; + set: (key: string, value: any) => void; + remove: (key: string) => any; + clear: () => void; +} + +export interface IStorage { + getItem: (key: string) => any; + setItem: (key: string, value: any) => void; + removeItem: (key: string) => any; + clear: () => void; } diff --git a/src/plugins/kibana_utils/public/store/react.ts b/src/plugins/kibana_utils/public/store/react.ts index d561f9bb3cf34..00861b2b0b8fe 100644 --- a/src/plugins/kibana_utils/public/store/react.ts +++ b/src/plugins/kibana_utils/public/store/react.ts @@ -86,10 +86,12 @@ export const createContext = < comparator?: Comparator ): Result => { const { state$, get } = useStore(); + /* eslint-disable react-hooks/exhaustive-deps */ const [observable$, unsubscribe] = useMemo( () => observableSelector(get(), state$, selector, comparator), [state$] ); + /* eslint-enable react-hooks/exhaustive-deps */ useLayoutEffect(() => unsubscribe, [observable$, unsubscribe]); const value = useObservable(observable$, selector(get())); return value; diff --git a/src/plugins/visualizations/kibana.json b/src/plugins/visualizations/kibana.json new file mode 100644 index 0000000000000..cf79ce17293d6 --- /dev/null +++ b/src/plugins/visualizations/kibana.json @@ -0,0 +1,9 @@ +{ + "id": "visualizations", + "version": "kibana", + "server": false, + "ui": true, + "requiredPlugins": [ + "expressions" + ] +} diff --git a/src/plugins/visualizations/public/expression_functions/range.ts b/src/plugins/visualizations/public/expression_functions/range.ts new file mode 100644 index 0000000000000..27c3654e2182a --- /dev/null +++ b/src/plugins/visualizations/public/expression_functions/range.ts @@ -0,0 +1,61 @@ +/* + * 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 { ExpressionFunction, KibanaDatatable, Range } from '../../../expressions/public'; + +const name = 'range'; + +type Context = KibanaDatatable | null; + +interface Arguments { + from: number; + to: number; +} + +export const range = (): ExpressionFunction => ({ + name, + help: i18n.translate('visualizations.function.range.help', { + defaultMessage: 'Generates range object', + }), + type: 'range', + args: { + from: { + types: ['number'], + help: i18n.translate('visualizations.function.range.from.help', { + defaultMessage: 'Start of range', + }), + required: true, + }, + to: { + types: ['number'], + help: i18n.translate('visualizations.function.range.to.help', { + defaultMessage: 'End of range', + }), + required: true, + }, + }, + fn: (context, args) => { + return { + type: 'range', + from: args.from, + to: args.to, + }; + }, +}); diff --git a/src/plugins/visualizations/public/expression_functions/vis_dimension.ts b/src/plugins/visualizations/public/expression_functions/vis_dimension.ts new file mode 100644 index 0000000000000..4ad73ef504874 --- /dev/null +++ b/src/plugins/visualizations/public/expression_functions/vis_dimension.ts @@ -0,0 +1,89 @@ +/* + * 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 { ExpressionFunction, KibanaDatatable } from '../../../expressions/public'; + +const name = 'visdimension'; + +type Context = KibanaDatatable | null; + +interface Arguments { + accessor: string | number; + format?: string; + formatParams?: string; +} + +type Return = any; + +export const visDimension = (): ExpressionFunction => ({ + name: 'visdimension', + help: i18n.translate('visualizations.function.visDimension.help', { + defaultMessage: 'Generates visConfig dimension object', + }), + type: 'vis_dimension', + context: { + types: ['kibana_datatable'], + }, + args: { + accessor: { + types: ['string', 'number'], + aliases: ['_'], + help: i18n.translate('visualizations.function.visDimension.accessor.help', { + defaultMessage: 'Column in your dataset to use (either column index or column name)', + }), + }, + format: { + types: ['string'], + default: 'string', + help: i18n.translate('visualizations.function.visDimension.format.help', { + defaultMessage: 'Format', + }), + }, + formatParams: { + types: ['string'], + default: '"{}"', + help: i18n.translate('visualizations.function.visDimension.formatParams.help', { + defaultMessage: 'Format params', + }), + }, + }, + fn: (context, args) => { + const accessor = + typeof args.accessor === 'number' + ? args.accessor + : context!.columns.find(c => c.id === args.accessor); + if (accessor === undefined) { + throw new Error( + i18n.translate('visualizations.function.visDimension.error.accessor', { + defaultMessage: 'Column name provided is invalid', + }) + ); + } + + return { + type: 'vis_dimension', + accessor, + format: { + id: args.format, + params: JSON.parse(args.formatParams!), + }, + }; + }, +}); diff --git a/src/plugins/visualizations/public/index.ts b/src/plugins/visualizations/public/index.ts index d8f7b5091eb8f..2b4b10c8329a3 100644 --- a/src/plugins/visualizations/public/index.ts +++ b/src/plugins/visualizations/public/index.ts @@ -17,4 +17,13 @@ * under the License. */ +import { PluginInitializerContext } from '../../../core/public'; +import { VisualizationsPublicPlugin } from './plugin'; + +export function plugin(initializerContext: PluginInitializerContext) { + return new VisualizationsPublicPlugin(initializerContext); +} + +export { VisualizationsPublicPlugin as Plugin }; +export * from './plugin'; export * from './types'; diff --git a/src/plugins/visualizations/public/mocks.ts b/src/plugins/visualizations/public/mocks.ts new file mode 100644 index 0000000000000..af7688d019f65 --- /dev/null +++ b/src/plugins/visualizations/public/mocks.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 { VisualizationsSetup, VisualizationsStart } from '.'; + +export type Setup = jest.Mocked; +export type Start = jest.Mocked; + +const createSetupContract = (): Setup => { + const setupContract: Setup = undefined; + return setupContract; +}; + +const createStartContract = (): Start => { + const startContract: Start = undefined; + return startContract; +}; + +export const expressionsPluginMock = { + createSetupContract, + createStartContract, +}; diff --git a/src/plugins/visualizations/public/plugin.ts b/src/plugins/visualizations/public/plugin.ts new file mode 100644 index 0000000000000..cceb63122820d --- /dev/null +++ b/src/plugins/visualizations/public/plugin.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 { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public'; +import { ExpressionsSetup, ExpressionsStart } from '../../expressions/public'; +import { range as rangeExpressionFunction } from './expression_functions/range'; +import { visDimension as visDimensionExpressionFunction } from './expression_functions/vis_dimension'; + +export interface VisualizationsSetupDeps { + expressions: ExpressionsSetup; +} + +export interface VisualizationsStartDeps { + expressions: ExpressionsStart; +} + +export type VisualizationsSetup = void; + +export type VisualizationsStart = void; + +export class VisualizationsPublicPlugin + implements + Plugin< + VisualizationsSetup, + VisualizationsStart, + VisualizationsSetupDeps, + VisualizationsStartDeps + > { + constructor(initializerContext: PluginInitializerContext) {} + + public setup(core: CoreSetup, { expressions }: VisualizationsSetupDeps): VisualizationsSetup { + expressions.registerFunction(rangeExpressionFunction); + expressions.registerFunction(visDimensionExpressionFunction); + + return undefined; + } + + public start(core: CoreStart, { expressions }: VisualizationsStartDeps): VisualizationsStart { + return undefined; + } + + public stop() {} +} diff --git a/test/accessibility/apps/discover.ts b/test/accessibility/apps/discover.ts new file mode 100644 index 0000000000000..e3f73ad4bcaf8 --- /dev/null +++ b/test/accessibility/apps/discover.ts @@ -0,0 +1,46 @@ +/* + * 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 { FtrProviderContext } from '../ftr_provider_context'; + +const FROM_TIME = '2015-09-19 06:31:44.000'; +const TO_TIME = '2015-09-23 18:31:44.000'; + +export default function({ getService, getPageObjects }: FtrProviderContext) { + const PageObjects = getPageObjects(['common', 'timePicker']); + const a11y = getService('a11y'); + const esArchiver = getService('esArchiver'); + const kibanaServer = getService('kibanaServer'); + + describe('Discover', () => { + before(async () => { + await esArchiver.load('discover'); + await esArchiver.loadIfNeeded('logstash_functional'); + await kibanaServer.uiSettings.update({ + defaultIndex: 'logstash-*', + }); + await PageObjects.common.navigateToApp('discover'); + await PageObjects.timePicker.setAbsoluteRange(FROM_TIME, TO_TIME); + }); + + it('main view', async () => { + await a11y.testAppSnapshot(); + }); + }); +} diff --git a/test/accessibility/apps/home.ts b/test/accessibility/apps/home.ts new file mode 100644 index 0000000000000..4df4d5f42c93d --- /dev/null +++ b/test/accessibility/apps/home.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 { FtrProviderContext } from '../ftr_provider_context'; + +export default function({ getService, getPageObjects }: FtrProviderContext) { + const PageObjects = getPageObjects(['common']); + const a11y = getService('a11y'); + + describe('Kibana Home', () => { + before(async () => { + await PageObjects.common.navigateToApp('home'); + }); + + it('Kibana Home view', async () => { + await a11y.testAppSnapshot(); + }); + }); +} diff --git a/test/accessibility/apps/management.ts b/test/accessibility/apps/management.ts new file mode 100644 index 0000000000000..842f4ecbafa9e --- /dev/null +++ b/test/accessibility/apps/management.ts @@ -0,0 +1,55 @@ +/* + * 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 { FtrProviderContext } from '../ftr_provider_context'; + +export default function({ getService, getPageObjects }: FtrProviderContext) { + const PageObjects = getPageObjects(['common', 'settings']); + const a11y = getService('a11y'); + + describe('Management', () => { + before(async () => { + await PageObjects.common.navigateToApp('settings'); + }); + + it('main view', async () => { + await a11y.testAppSnapshot(); + }); + + it('index pattern page', async () => { + await PageObjects.settings.clickKibanaIndexPatterns(); + await a11y.testAppSnapshot(); + }); + + it('Single indexpattern view', async () => { + await PageObjects.settings.clickIndexPatternLogstash(); + await a11y.testAppSnapshot(); + }); + + it('Saved objects view', async () => { + await PageObjects.settings.clickKibanaSavedObjects(); + await a11y.testAppSnapshot(); + }); + + it('Advanced settings', async () => { + await PageObjects.settings.clickKibanaSettings(); + await a11y.testAppSnapshot(); + }); + }); +} diff --git a/test/accessibility/config.ts b/test/accessibility/config.ts new file mode 100644 index 0000000000000..d73a73820a117 --- /dev/null +++ b/test/accessibility/config.ts @@ -0,0 +1,42 @@ +/* + * 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 { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { services } from './services'; +import { pageObjects } from './page_objects'; + +export default async function({ readConfigFile }: FtrConfigProviderContext) { + const functionalConfig = await readConfigFile(require.resolve('../functional/config')); + + return { + ...functionalConfig.getAll(), + + testFiles: [ + require.resolve('./apps/discover'), + require.resolve('./apps/management'), + require.resolve('./apps/home'), + ], + pageObjects, + services, + + junit: { + reportName: 'Accessibility Tests', + }, + }; +} diff --git a/test/accessibility/ftr_provider_context.d.ts b/test/accessibility/ftr_provider_context.d.ts new file mode 100644 index 0000000000000..22df3b16150a4 --- /dev/null +++ b/test/accessibility/ftr_provider_context.d.ts @@ -0,0 +1,25 @@ +/* + * 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 { GenericFtrProviderContext } from '@kbn/test/types/ftr'; + +import { pageObjects } from './page_objects'; +import { services } from './services'; + +export type FtrProviderContext = GenericFtrProviderContext; diff --git a/test/accessibility/page_objects.ts b/test/accessibility/page_objects.ts new file mode 100644 index 0000000000000..151b6b34781b8 --- /dev/null +++ b/test/accessibility/page_objects.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 { pageObjects } from '../functional/page_objects'; diff --git a/test/accessibility/services/a11y/a11y.ts b/test/accessibility/services/a11y/a11y.ts new file mode 100644 index 0000000000000..7adfe7ebfcc7d --- /dev/null +++ b/test/accessibility/services/a11y/a11y.ts @@ -0,0 +1,130 @@ +/* + * 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 chalk from 'chalk'; +import testSubjectToCss from '@kbn/test-subj-selector'; + +import { FtrProviderContext } from '../../ftr_provider_context'; +import { AxeReport, printResult } from './axe_report'; +// @ts-ignore JS that is run in browser as is +import { analyzeWithAxe, analyzeWithAxeWithClient } from './analyze_with_axe'; + +interface AxeContext { + include?: string[]; + exclude?: string[][]; +} + +interface TestOptions { + excludeTestSubj?: string | string[]; +} + +export const normalizeResult = (report: any) => { + if (report.error) { + throw report.error; + } + + return report.result as false | AxeReport; +}; + +export function A11yProvider({ getService }: FtrProviderContext) { + const browser = getService('browser'); + const Wd = getService('__webdriver__'); + const log = getService('log'); + + /** + * Accessibility testing service using the Axe (https://www.deque.com/axe/) + * toolset to validate a11y rules similar to ESLint. In order to test against + * the rules we must load up the UI and feed a full HTML snapshot into Axe. + */ + return new (class Accessibility { + public async testAppSnapshot(options: TestOptions = {}) { + const context = this.getAxeContext(true, options.excludeTestSubj); + const report = await this.captureAxeReport(context); + await this.testAxeReport(report); + } + + public async testGlobalSnapshot(options: TestOptions = {}) { + const context = this.getAxeContext(false, options.excludeTestSubj); + const report = await this.captureAxeReport(context); + await this.testAxeReport(report); + } + + private getAxeContext(global: boolean, excludeTestSubj?: string | string[]): AxeContext { + return { + include: global ? undefined : [testSubjectToCss('appA11yRoot')], + exclude: ([] as string[]) + .concat(excludeTestSubj || []) + .map(ts => [testSubjectToCss(ts)]) + .concat([['.ace_scrollbar']]), + }; + } + + private testAxeReport(report: AxeReport) { + const errorMsgs = []; + + for (const result of report.incomplete) { + // these items require human review and can't be definitively validated + log.warning(printResult(chalk.yellow('UNABLE TO VALIDATE'), result)); + } + + for (const result of report.violations) { + errorMsgs.push(printResult(chalk.red('VIOLATION'), result)); + } + + if (errorMsgs.length) { + throw new Error(`a11y report:\n${errorMsgs.join('\n')}`); + } + } + + private async captureAxeReport(context: AxeContext): Promise { + const axeOptions = { + reporter: 'v2', + runOnly: ['wcag2a', 'wcag2aa'], + rules: { + 'color-contrast': { + enabled: false, + }, + }, + }; + + await (Wd.driver.manage() as any).setTimeouts({ + ...(await (Wd.driver.manage() as any).getTimeouts()), + script: 600000, + }); + + const report = normalizeResult( + await browser.executeAsync(analyzeWithAxe, context, axeOptions) + ); + + if (report !== false) { + return report; + } + + const withClientReport = normalizeResult( + await browser.executeAsync(analyzeWithAxeWithClient, context, axeOptions) + ); + + if (withClientReport === false) { + throw new Error('Attempted to analyze with axe but failed to load axe client'); + } + + return withClientReport; + } + })(); +} diff --git a/test/accessibility/services/a11y/analyze_with_axe.js b/test/accessibility/services/a11y/analyze_with_axe.js new file mode 100644 index 0000000000000..5cba55a29f8a4 --- /dev/null +++ b/test/accessibility/services/a11y/analyze_with_axe.js @@ -0,0 +1,39 @@ +/* + * 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 { readFileSync } from 'fs'; + +export function analyzeWithAxe(context, options, callback) { + Promise.resolve() + .then(() => { + if (window.axe) { + return window.axe.run(context, options); + } + + // return a false report to trigger analyzeWithAxeWithClient + return false; + }) + .then(result => callback({ result }), error => callback({ error })); +} + +export const analyzeWithAxeWithClient = ` + ${readFileSync(require.resolve('axe-core/axe.js'), 'utf8')} + + return (${analyzeWithAxe.toString()}).apply(null, arguments); +`; diff --git a/test/accessibility/services/a11y/axe_report.ts b/test/accessibility/services/a11y/axe_report.ts new file mode 100644 index 0000000000000..ba1e8c739079d --- /dev/null +++ b/test/accessibility/services/a11y/axe_report.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. + */ + +type AxeImpact = 'minor' | 'moderate' | 'serious' | 'critical'; + +type AxeRelatedNodes = Array<{ + data: any; + id: string; + impact: AxeImpact; + message: string; + relatedNodes: []; +}>; + +export interface AxeResult { + /* Rule description */ + description: string; + /* rule title/error message */ + help: string; + /* documentation url */ + helpUrl: string; + /* rule id */ + id: string; + /* severity level */ + impact?: AxeImpact; + /* tags used to group rules */ + tags: string[]; + /* nodes grouped in this result */ + nodes: Array<{ + all: AxeRelatedNodes; + any: AxeRelatedNodes; + none: AxeRelatedNodes; + + html: string; + impact: AxeImpact; + target: string[]; + }>; +} + +export type AxeResultGroup = AxeResult[]; + +export interface AxeReport { + inapplicable: AxeResultGroup; + passes: AxeResultGroup; + incomplete: AxeResultGroup; + violations: AxeResultGroup; +} + +export const printResult = (title: string, result: AxeResult) => ` +${title} + [${result.id}]: ${result.description} + Help: ${result.helpUrl} + Elements: + - ${result.nodes.map(node => node.target).join('\n - ')}`; diff --git a/src/plugins/expressions/common/index.ts b/test/accessibility/services/a11y/index.ts similarity index 95% rename from src/plugins/expressions/common/index.ts rename to test/accessibility/services/a11y/index.ts index af870208f4865..7baa17c1eafa3 100644 --- a/src/plugins/expressions/common/index.ts +++ b/test/accessibility/services/a11y/index.ts @@ -17,4 +17,4 @@ * under the License. */ -export * from './expressions'; +export { A11yProvider } from './a11y'; diff --git a/test/accessibility/services/index.ts b/test/accessibility/services/index.ts new file mode 100644 index 0000000000000..98d1628732f5c --- /dev/null +++ b/test/accessibility/services/index.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. + */ + +import { services as kibanaFunctionalServices } from '../../functional/services'; +import { A11yProvider } from './a11y'; + +export const services = { + ...kibanaFunctionalServices, + a11y: A11yProvider, +}; diff --git a/test/api_integration/apis/core/index.js b/test/api_integration/apis/core/index.js index e5da4e4730662..d617b2ad07351 100644 --- a/test/api_integration/apis/core/index.js +++ b/test/api_integration/apis/core/index.js @@ -16,45 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -import expect from '@kbn/expect'; export default function ({ getService }) { const supertest = getService('supertest'); - describe('core', () => { - describe('request context', () => { - it('provides access to elasticsearch', async () => ( - await supertest - .get('/requestcontext/elasticsearch') - .expect(200, 'Elasticsearch: true') - )); + describe('core request context', () => { + it('provides access to elasticsearch', async () => ( + await supertest + .get('/requestcontext/elasticsearch') + .expect(200, 'Elasticsearch: true') + )); - it('provides access to SavedObjects client', async () => ( - await supertest - .get('/requestcontext/savedobjectsclient') - .expect(200, 'SavedObjects client: {"page":1,"per_page":20,"total":0,"saved_objects":[]}') - )); - }); - - describe('compression', () => { - it(`uses compression when there isn't a referer`, async () => { - await supertest - .get('/app/kibana') - .set('accept-encoding', 'gzip') - .then(response => { - expect(response.headers).to.have.property('content-encoding', 'gzip'); - }); - }); - - it(`doesn't use compression when there is a referer`, async () => { - await supertest - .get('/app/kibana') - .set('accept-encoding', 'gzip') - .set('referer', 'https://www.google.com') - .then(response => { - expect(response.headers).not.to.have.property('content-encoding'); - }); - }); - }); + it('provides access to SavedObjects client', async () => ( + await supertest + .get('/requestcontext/savedobjectsclient') + .expect(200, 'SavedObjects client: {"page":1,"per_page":20,"total":0,"saved_objects":[]}') + )); }); } diff --git a/test/api_integration/apis/index.js b/test/api_integration/apis/index.js index de36ee678b10e..9f2672959390c 100644 --- a/test/api_integration/apis/index.js +++ b/test/api_integration/apis/index.js @@ -34,6 +34,5 @@ export default function ({ loadTestFile }) { loadTestFile(require.resolve('./status')); loadTestFile(require.resolve('./stats')); loadTestFile(require.resolve('./ui_metric')); - loadTestFile(require.resolve('./core')); }); } diff --git a/test/api_integration/apis/index_patterns/es_errors/errors.js b/test/api_integration/apis/index_patterns/es_errors/errors.js index 7e04e3f7204d7..4e50b965211c2 100644 --- a/test/api_integration/apis/index_patterns/es_errors/errors.js +++ b/test/api_integration/apis/index_patterns/es_errors/errors.js @@ -26,7 +26,7 @@ import { createNoMatchingIndicesError, isNoMatchingIndicesError, convertEsError -} from '../../../../../src/legacy/server/index_patterns/service/lib/errors'; +} from '../../../../../src/plugins/data/server/index_patterns/fetcher/lib/errors'; import { getIndexNotFoundError, diff --git a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js index 37916d3bee375..2bd574d669e20 100644 --- a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js +++ b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js @@ -20,7 +20,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); const supertest = getService('supertest'); - const chance = getService('chance'); + const randomness = getService('randomness'); describe('params', () => { before(() => esArchiver.load('index_patterns/basic_index')); @@ -63,8 +63,8 @@ export default function ({ getService }) { supertest .get('/api/index_patterns/_fields_for_wildcard') .query({ - pattern: chance.word(), - [chance.word()]: chance.word(), + pattern: randomness.word(), + [randomness.word()]: randomness.word(), }) .expect(400)); }); diff --git a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js index d909b51e94ac0..bc70339bd1a66 100644 --- a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js +++ b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js @@ -61,8 +61,7 @@ export default function ({ getService }) { aggregatable: true, name: 'baz.keyword', readFromDocValues: true, - parent: 'baz', - subType: 'multi', + subType: { multi: { parent: 'baz' } } }, { type: 'number', @@ -72,6 +71,21 @@ export default function ({ getService }) { name: 'foo', readFromDocValues: true, }, + { + aggregatable: true, + esTypes: [ + 'keyword' + ], + name: 'nestedField.child', + readFromDocValues: true, + searchable: true, + subType: { + nested: { + path: 'nestedField' + } + }, + type: 'string', + }, ], }) .then(ensureFieldsAreSorted)); @@ -124,8 +138,7 @@ export default function ({ getService }) { aggregatable: true, name: 'baz.keyword', readFromDocValues: true, - parent: 'baz', - subType: 'multi', + subType: { multi: { parent: 'baz' } } }, { aggregatable: false, @@ -142,6 +155,21 @@ export default function ({ getService }) { name: 'foo', readFromDocValues: true, }, + { + aggregatable: true, + esTypes: [ + 'keyword' + ], + name: 'nestedField.child', + readFromDocValues: true, + searchable: true, + subType: { + nested: { + path: 'nestedField' + } + }, + type: 'string', + }, ], }) .then(ensureFieldsAreSorted)); diff --git a/test/api_integration/apis/suggestions/suggestions.js b/test/api_integration/apis/suggestions/suggestions.js index 80b6febb81d7b..abacf13c7aa06 100644 --- a/test/api_integration/apis/suggestions/suggestions.js +++ b/test/api_integration/apis/suggestions/suggestions.js @@ -22,8 +22,14 @@ export default function ({ getService }) { const supertest = getService('supertest'); describe('Suggestions API', function () { - before(() => esArchiver.load('index_patterns/basic_index')); - after(() => esArchiver.unload('index_patterns/basic_index')); + before(async () => { + await esArchiver.load('index_patterns/basic_index'); + await esArchiver.load('index_patterns/basic_kibana'); + }); + after(async () => { + await esArchiver.unload('index_patterns/basic_index'); + await esArchiver.unload('index_patterns/basic_kibana'); + }); it('should return 200 with special characters', () => ( supertest @@ -34,5 +40,15 @@ export default function ({ getService }) { }) .expect(200) )); + + it('should support nested fields', () => ( + supertest + .post('/api/kibana/suggestions/values/basic_index') + .send({ + field: 'nestedField.child', + query: 'nes' + }) + .expect(200, ['nestedValue']) + )); }); } diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/data.json.gz b/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/data.json.gz index edae3bfdaa2ea..ec085ec813240 100644 Binary files a/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/data.json.gz and b/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/data.json.gz differ diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/mappings.json b/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/mappings.json index 5d0d426010953..338b31dc681ae 100644 --- a/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/mappings.json +++ b/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/mappings.json @@ -24,8 +24,18 @@ }, "foo": { "type": "long" + }, + "nestedField": { + "type": "nested", + "properties": { + "child": { + "type": "keyword" + } + } } } } } -} \ No newline at end of file +} + + diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/data.json b/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/data.json new file mode 100644 index 0000000000000..54276b59dcc23 --- /dev/null +++ b/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/data.json @@ -0,0 +1,15 @@ +{ + "type": "doc", + "value": { + "index": ".kibana", + "id": "index-pattern:91200a00-9efd-11e7-acb3-3dab96693fab", + "source": { + "type": "index-pattern", + "updated_at": "2017-09-21T18:49:16.270Z", + "index-pattern": { + "title": "basic_index", + "fields": "[{\"name\":\"bar\",\"type\":\"boolean\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"baz\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"baz.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"foo\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"nestedField.child\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"nested\":{\"path\":\"nestedField\"}}}]" + } + } + } +} diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/mappings.json b/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/mappings.json new file mode 100644 index 0000000000000..99264d7ebbff8 --- /dev/null +++ b/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/mappings.json @@ -0,0 +1,253 @@ +{ + "type": "index", + "value": { + "index": ".kibana", + "settings": { + "index": { + "number_of_shards": "1", + "number_of_replicas": "1" + } + }, + "mappings": { + "dynamic": "strict", + "properties": { + "config": { + "dynamic": "true", + "properties": { + "buildNum": { + "type": "keyword" + }, + "defaultIndex": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 + } + } + } + } + }, + "dashboard": { + "properties": { + "description": { + "type": "text" + }, + "hits": { + "type": "integer" + }, + "kibanaSavedObjectMeta": { + "properties": { + "searchSourceJSON": { + "type": "text" + } + } + }, + "optionsJSON": { + "type": "text" + }, + "panelsJSON": { + "type": "text" + }, + "refreshInterval": { + "properties": { + "display": { + "type": "keyword" + }, + "pause": { + "type": "boolean" + }, + "section": { + "type": "integer" + }, + "value": { + "type": "integer" + } + } + }, + "timeFrom": { + "type": "keyword" + }, + "timeRestore": { + "type": "boolean" + }, + "timeTo": { + "type": "keyword" + }, + "title": { + "type": "text" + }, + "uiStateJSON": { + "type": "text" + }, + "version": { + "type": "integer" + } + } + }, + "index-pattern": { + "properties": { + "fieldFormatMap": { + "type": "text" + }, + "fields": { + "type": "text" + }, + "intervalName": { + "type": "keyword" + }, + "notExpandable": { + "type": "boolean" + }, + "sourceFilters": { + "type": "text" + }, + "timeFieldName": { + "type": "keyword" + }, + "title": { + "type": "text" + } + } + }, + "search": { + "properties": { + "columns": { + "type": "keyword" + }, + "description": { + "type": "text" + }, + "hits": { + "type": "integer" + }, + "kibanaSavedObjectMeta": { + "properties": { + "searchSourceJSON": { + "type": "text" + } + } + }, + "sort": { + "type": "keyword" + }, + "title": { + "type": "text" + }, + "version": { + "type": "integer" + } + } + }, + "server": { + "properties": { + "uuid": { + "type": "keyword" + } + } + }, + "timelion-sheet": { + "properties": { + "description": { + "type": "text" + }, + "hits": { + "type": "integer" + }, + "kibanaSavedObjectMeta": { + "properties": { + "searchSourceJSON": { + "type": "text" + } + } + }, + "timelion_chart_height": { + "type": "integer" + }, + "timelion_columns": { + "type": "integer" + }, + "timelion_interval": { + "type": "keyword" + }, + "timelion_other_interval": { + "type": "keyword" + }, + "timelion_rows": { + "type": "integer" + }, + "timelion_sheet": { + "type": "text" + }, + "title": { + "type": "text" + }, + "version": { + "type": "integer" + } + } + }, + "namespace": { + "type": "keyword" + }, + "type": { + "type": "keyword" + }, + "updated_at": { + "type": "date" + }, + "url": { + "properties": { + "accessCount": { + "type": "long" + }, + "accessDate": { + "type": "date" + }, + "createDate": { + "type": "date" + }, + "url": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 2048 + } + } + } + } + }, + "visualization": { + "properties": { + "description": { + "type": "text" + }, + "kibanaSavedObjectMeta": { + "properties": { + "searchSourceJSON": { + "type": "text" + } + } + }, + "savedSearchId": { + "type": "keyword" + }, + "title": { + "type": "text" + }, + "uiStateJSON": { + "type": "text" + }, + "version": { + "type": "integer" + }, + "visState": { + "type": "text" + } + } + } + } + } + } +} diff --git a/test/api_integration/services/index.ts b/test/api_integration/services/index.ts index d0fcd94a6a204..573450cae534a 100644 --- a/test/api_integration/services/index.ts +++ b/test/api_integration/services/index.ts @@ -22,14 +22,11 @@ import { services as commonServices } from '../../common/services'; // @ts-ignore not TS yet import { KibanaSupertestProvider, ElasticsearchSupertestProvider } from './supertest'; -// @ts-ignore not TS yet -import { ChanceProvider } from './chance'; - export const services = { es: commonServices.es, esArchiver: commonServices.esArchiver, retry: commonServices.retry, supertest: KibanaSupertestProvider, esSupertest: ElasticsearchSupertestProvider, - chance: ChanceProvider, + randomness: commonServices.randomness, }; diff --git a/test/common/services/index.ts b/test/common/services/index.ts index 47d93d811e3f6..225aacc1c9895 100644 --- a/test/common/services/index.ts +++ b/test/common/services/index.ts @@ -21,10 +21,12 @@ import { LegacyEsProvider } from './legacy_es'; import { EsArchiverProvider } from './es_archiver'; import { KibanaServerProvider } from './kibana_server'; import { RetryProvider } from './retry'; +import { RandomnessProvider } from './randomness'; export const services = { es: LegacyEsProvider, esArchiver: EsArchiverProvider, kibanaServer: KibanaServerProvider, retry: RetryProvider, + randomness: RandomnessProvider, }; diff --git a/test/common/services/randomness.ts b/test/common/services/randomness.ts new file mode 100644 index 0000000000000..2a49703e92c58 --- /dev/null +++ b/test/common/services/randomness.ts @@ -0,0 +1,89 @@ +/* + * 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 Chance from 'chance'; + +import { FtrProviderContext } from '../ftr_provider_context'; + +interface CharOptions { + pool?: string; + alpha?: boolean; + numeric?: boolean; + symbols?: boolean; + casing?: 'lower' | 'upper'; +} + +interface StringOptions extends CharOptions { + length?: number; +} + +interface NumberOptions { + min?: number; + max?: number; +} + +export function RandomnessProvider({ getService }: FtrProviderContext) { + const log = getService('log'); + + const seed = Date.now(); + log.debug('randomness seed: %j', seed); + + const chance = new Chance(seed); + + return new (class RandomnessService { + /** + * Generate a random natural number + * + * range: 0 to 9007199254740991 + * + */ + naturalNumber(options?: NumberOptions) { + return chance.natural(options); + } + + /** + * Generate a random integer + */ + integer(options?: NumberOptions) { + return chance.integer(options); + } + + /** + * Generate a random number, defaults to at least 4 and no more than 8 syllables + */ + word(options: { syllables?: number } = {}) { + const { syllables = this.naturalNumber({ min: 4, max: 8 }) } = options; + + return chance.word({ + syllables, + }); + } + + /** + * Generate a random string, defaults to at least 8 and no more than 15 alpha-numeric characters + */ + string(options: StringOptions = {}) { + return chance.string({ + length: this.naturalNumber({ min: 8, max: 15 }), + ...(options.pool === 'undefined' ? { alpha: true, numeric: true, symbols: false } : {}), + ...options, + }); + } + })(); +} diff --git a/test/functional/apps/dashboard/dashboard_state.js b/test/functional/apps/dashboard/dashboard_state.js index 6dfef4c54c66b..b9ad47e428e82 100644 --- a/test/functional/apps/dashboard/dashboard_state.js +++ b/test/functional/apps/dashboard/dashboard_state.js @@ -24,7 +24,7 @@ import { PIE_CHART_VIS_NAME, AREA_CHART_VIS_NAME } from '../../page_objects/dash // eslint-disable-next-line import { DEFAULT_PANEL_WIDTH -} from '../../../../src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_constants'; +} from '../../../../src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_constants'; export default function ({ getService, getPageObjects }) { const PageObjects = getPageObjects(['dashboard', 'visualize', 'header', 'discover']); diff --git a/test/functional/apps/discover/_discover.js b/test/functional/apps/discover/_discover.js index 6c7170d6b2168..9d3f95e28942a 100644 --- a/test/functional/apps/discover/_discover.js +++ b/test/functional/apps/discover/_discover.js @@ -26,6 +26,7 @@ export default function ({ getService, getPageObjects }) { const browser = getService('browser'); const kibanaServer = getService('kibanaServer'); const filterBar = getService('filterBar'); + const queryBar = getService('queryBar'); const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker']); const defaultSettings = { defaultIndex: 'logstash-*', @@ -154,6 +155,26 @@ export default function ({ getService, getPageObjects }) { }); }); + describe('nested query', () => { + + before(async () => { + log.debug('setAbsoluteRangeForAnotherQuery'); + await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime); + await PageObjects.discover.waitUntilSearchingHasFinished(); + }); + + it('should support querying on nested fields', async function () { + await queryBar.setQuery('nestedField:{ child: nestedValue }'); + await queryBar.submitQuery(); + await retry.try(async function () { + expect(await PageObjects.discover.getHitCount()).to.be( + '1' + ); + }); + }); + + }); + describe('filter editor', function () { it('should add a phrases filter', async function () { await filterBar.addFilter('extension.raw', 'is one of', 'jpg'); diff --git a/test/functional/fixtures/es_archiver/discover/data.json.gz b/test/functional/fixtures/es_archiver/discover/data.json.gz index c607f211d37c2..047d890f6d410 100644 Binary files a/test/functional/fixtures/es_archiver/discover/data.json.gz and b/test/functional/fixtures/es_archiver/discover/data.json.gz differ diff --git a/test/functional/fixtures/es_archiver/logstash_functional/data.json.gz b/test/functional/fixtures/es_archiver/logstash_functional/data.json.gz index 2cef071738526..a212c34e2ead6 100644 Binary files a/test/functional/fixtures/es_archiver/logstash_functional/data.json.gz and b/test/functional/fixtures/es_archiver/logstash_functional/data.json.gz differ diff --git a/test/functional/fixtures/es_archiver/logstash_functional/mappings.json b/test/functional/fixtures/es_archiver/logstash_functional/mappings.json index dcfafa2612c5b..010abff9cf6a9 100644 --- a/test/functional/fixtures/es_archiver/logstash_functional/mappings.json +++ b/test/functional/fixtures/es_archiver/logstash_functional/mappings.json @@ -153,6 +153,14 @@ } } }, + "nestedField": { + "type": "nested", + "properties": { + "child": { + "type": "keyword" + } + } + }, "phpmemory": { "type": "long" }, @@ -518,6 +526,14 @@ } } }, + "nestedField": { + "type": "nested", + "properties": { + "child": { + "type": "keyword" + } + } + }, "phpmemory": { "type": "long" }, @@ -883,6 +899,14 @@ } } }, + "nestedField": { + "type": "nested", + "properties": { + "child": { + "type": "keyword" + } + } + }, "phpmemory": { "type": "long" }, @@ -1091,4 +1115,4 @@ } } } -} \ No newline at end of file +} diff --git a/test/functional/page_objects/discover_page.js b/test/functional/page_objects/discover_page.js index 4654b85f9c7c4..8d12b2117a214 100644 --- a/test/functional/page_objects/discover_page.js +++ b/test/functional/page_objects/discover_page.js @@ -283,19 +283,13 @@ export function DiscoverPageProvider({ getService, getPageObjects }) { } async openSidebarFieldFilter() { - const fieldFilterFormExists = await testSubjects.exists('discoverFieldFilter'); - if (!fieldFilterFormExists) { - await testSubjects.click('toggleFieldFilterButton'); - await testSubjects.existOrFail('discoverFieldFilter'); - } + await testSubjects.click('toggleFieldFilterButton'); + await testSubjects.existOrFail('filterSelectionPanel'); } async closeSidebarFieldFilter() { - const fieldFilterFormExists = await testSubjects.exists('discoverFieldFilter'); - if (fieldFilterFormExists) { - await testSubjects.click('toggleFieldFilterButton'); - await testSubjects.missingOrFail('discoverFieldFilter', { allowHidden: true }); - } + await testSubjects.click('toggleFieldFilterButton'); + await testSubjects.missingOrFail('filterSelectionPanel', { allowHidden: true }); } } diff --git a/test/functional/services/browser.ts b/test/functional/services/browser.ts index 4060e3dd7800f..97e02958f3787 100644 --- a/test/functional/services/browser.ts +++ b/test/functional/services/browser.ts @@ -461,10 +461,7 @@ export async function BrowserProvider({ getService }: FtrProviderContext) { ); } - public async executeAsync( - fn: string | ((...args: A) => R), - ...args: A - ): Promise { + public async executeAsync(fn: string | ((...args: any[]) => R), ...args: any[]): Promise { return await driver.executeAsyncScript( fn, ...cloneDeep(args, arg => { diff --git a/test/functional/services/remote/webdriver.ts b/test/functional/services/remote/webdriver.ts index 5ebec6bde6ebb..201354fff48ef 100644 --- a/test/functional/services/remote/webdriver.ts +++ b/test/functional/services/remote/webdriver.ts @@ -75,13 +75,23 @@ async function attemptToCreateCommand( case 'chrome': { const chromeCapabilities = Capabilities.chrome(); const chromeOptions = [ - 'disable-translate', - 'new-window', + // Disables the sandbox for all process types that are normally sandboxed. 'no-sandbox', + // Launches URL in new browser window. + 'new-window', + // By default, file:// URIs cannot read other file:// URIs. This is an override for developers who need the old behavior for testing. 'allow-file-access-from-files', + // Use fake device for Media Stream to replace actual camera and microphone. 'use-fake-device-for-media-stream', + // Bypass the media stream infobar by selecting the default device for media streams (e.g. WebRTC). Works with --use-fake-device-for-media-stream. 'use-fake-ui-for-media-stream', ]; + if (process.platform === 'linux') { + // The /dev/shm partition is too small in certain VM environments, causing + // Chrome to fail or crash. Use this flag to work-around this issue + // (a temporary directory will always be used to create anonymous shared memory files). + chromeOptions.push('disable-dev-shm-usage'); + } if (headlessBrowser === '1') { // Use --disable-gpu to avoid an error from a missing Mesa library, as per // See: https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json index 21b49a9823f62..766e6168002c2 100644 --- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json +++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json @@ -7,7 +7,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "14.7.0", + "@elastic/eui": "14.8.0", "react": "^16.8.0", "react-dom": "^16.8.0" } diff --git a/test/plugin_functional/plugins/core_plugin_a/public/application.tsx b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx index 5d464cf0405d0..7c1406f5b20c3 100644 --- a/test/plugin_functional/plugins/core_plugin_a/public/application.tsx +++ b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx @@ -76,7 +76,7 @@ const PageA = () => ( - Page A's content goes here + Page A's content goes here ); diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json index 7aacfbc22ceee..7c5b6f6be58af 100644 --- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json +++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json @@ -7,7 +7,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "14.7.0", + "@elastic/eui": "14.8.0", "react": "^16.8.0" } } diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json index 80ec89fb0078a..ef472b4026957 100644 --- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json +++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json @@ -8,7 +8,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "14.7.0", + "@elastic/eui": "14.8.0", "react": "^16.8.0" }, "scripts": { diff --git a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json index 54aba07079eeb..277bb09ac745c 100644 --- a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json +++ b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json @@ -8,7 +8,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "14.7.0", + "@elastic/eui": "14.8.0", "react": "^16.8.0" }, "scripts": { diff --git a/test/plugin_functional/plugins/kbn_tp_top_nav/public/top_nav.tsx b/test/plugin_functional/plugins/kbn_tp_top_nav/public/top_nav.tsx index d56ac5f92db88..8678ab705df9c 100644 --- a/test/plugin_functional/plugins/kbn_tp_top_nav/public/top_nav.tsx +++ b/test/plugin_functional/plugins/kbn_tp_top_nav/public/top_nav.tsx @@ -17,7 +17,7 @@ * under the License. */ -import React, { Component } from 'react'; +import React from 'react'; import { setup as navSetup, start as navStart, @@ -33,22 +33,21 @@ const customExtension = { navSetup.registerMenuItem(customExtension); -export class AppWithTopNav extends Component { - public render() { - const { TopNavMenu } = navStart.ui; - const config = [ - { - id: 'new', - label: 'New Button', - description: 'New Demo', - run() {}, - testId: 'demoNewButton', - }, - ]; - return ( - - Hey - - ); - } -} +export const AppWithTopNav = () => { + const { TopNavMenu } = navStart.ui; + const config = [ + { + id: 'new', + label: 'New Button', + description: 'New Demo', + run() {}, + testId: 'demoNewButton', + }, + ]; + + return ( + + Hey + + ); +}; diff --git a/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json b/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json index 121f69ada329b..f248a7e4d1f2d 100644 --- a/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json +++ b/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json @@ -7,7 +7,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "14.7.0", + "@elastic/eui": "14.8.0", "react": "^16.8.0", "react-dom": "^16.8.0" } diff --git a/test/plugin_functional/plugins/search_explorer/public/demo_strategy.tsx b/test/plugin_functional/plugins/search_explorer/public/demo_strategy.tsx index 665b3c9f0ae03..8a0dd31e3595f 100644 --- a/test/plugin_functional/plugins/search_explorer/public/demo_strategy.tsx +++ b/test/plugin_functional/plugins/search_explorer/public/demo_strategy.tsx @@ -127,7 +127,7 @@ export class DemoStrategy extends React.Component { }, ]} demo={this.renderDemo()} - > + /> ); } diff --git a/test/plugin_functional/plugins/search_explorer/public/es_strategy.tsx b/test/plugin_functional/plugins/search_explorer/public/es_strategy.tsx index 20de631bc5605..d35c67191a1f8 100644 --- a/test/plugin_functional/plugins/search_explorer/public/es_strategy.tsx +++ b/test/plugin_functional/plugins/search_explorer/public/es_strategy.tsx @@ -139,7 +139,7 @@ export class EsSearchTest extends React.Component { }, ]} demo={this.renderDemo()} - > + /> ); } diff --git a/test/plugin_functional/plugins/search_explorer/public/guide_section.tsx b/test/plugin_functional/plugins/search_explorer/public/guide_section.tsx index fe67e4097b2a3..1562e33b14c2f 100644 --- a/test/plugin_functional/plugins/search_explorer/public/guide_section.tsx +++ b/test/plugin_functional/plugins/search_explorer/public/guide_section.tsx @@ -110,7 +110,7 @@ export class GuideSection extends React.Component { return code.map((codeBlock, i) => ( - +

{codeBlock.description}

{this.removeLicenseBlock(codeBlock.snippet)} diff --git a/test/plugin_functional/plugins/search_explorer/public/search_api.tsx b/test/plugin_functional/plugins/search_explorer/public/search_api.tsx index 3e4768c870064..8ec6225d1f172 100644 --- a/test/plugin_functional/plugins/search_explorer/public/search_api.tsx +++ b/test/plugin_functional/plugins/search_explorer/public/search_api.tsx @@ -83,5 +83,5 @@ export const SearchApiPage = () => ( ], }, ]} - > + /> ); diff --git a/test/scripts/jenkins_accessibility.sh b/test/scripts/jenkins_accessibility.sh new file mode 100755 index 0000000000000..0b3d8dc3f85c2 --- /dev/null +++ b/test/scripts/jenkins_accessibility.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -e + +if [[ -n "$IS_PIPELINE_JOB" ]] ; then + source src/dev/ci_setup/setup_env.sh +fi + +export TEST_BROWSER_HEADLESS=1 + +if [[ -z "$IS_PIPELINE_JOB" ]] ; then + yarn run grunt functionalTests:ensureAllTestsInCiGroup; + node scripts/build --debug --oss; +else + installDir="$(realpath $PARENT_DIR/kibana/build/oss/kibana-*-SNAPSHOT-linux-x86_64)" + destDir=${installDir}-${CI_WORKER_NUMBER} + cp -R "$installDir" "$destDir" + + export KIBANA_INSTALL_DIR="$destDir" +fi + +checks-reporter-with-killswitch "Kibana accessibility tests" \ + node scripts/functional_tests \ + --debug --bail \ + --kibana-install-dir "$installDir" \ + --config test/accessibility/config.ts; diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index 274cca695b535..c6bddb69aa570 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -1,12 +1,6 @@ #!/usr/bin/env bash -set -e - -if [[ -n "$IS_PIPELINE_JOB" ]] ; then - source src/dev/ci_setup/setup_env.sh -fi - -export TEST_BROWSER_HEADLESS=1 +source test/scripts/jenkins_test_setup.sh if [[ -z "$IS_PIPELINE_JOB" ]] ; then yarn run grunt functionalTests:ensureAllTestsInCiGroup; diff --git a/test/scripts/jenkins_firefox_smoke.sh b/test/scripts/jenkins_firefox_smoke.sh index 69cedc9657340..9a31f5f43d224 100755 --- a/test/scripts/jenkins_firefox_smoke.sh +++ b/test/scripts/jenkins_firefox_smoke.sh @@ -1,10 +1,6 @@ #!/usr/bin/env bash -set -e - -if [[ -n "$IS_PIPELINE_JOB" ]] ; then - source src/dev/ci_setup/setup_env.sh -fi +source test/scripts/jenkins_test_setup.sh if [[ -z "$IS_PIPELINE_JOB" ]] ; then node scripts/build --debug --oss; diff --git a/test/scripts/jenkins_test_setup.sh b/test/scripts/jenkins_test_setup.sh new file mode 100644 index 0000000000000..e2dd0bc276bb6 --- /dev/null +++ b/test/scripts/jenkins_test_setup.sh @@ -0,0 +1,20 @@ +set -e + +function post_work() { + set +e + if [[ -z "$IS_PIPELINE_JOB" ]] ; then + node "$KIBANA_DIR/scripts/report_failed_tests" + fi + + if [[ -z "$REMOVE_KIBANA_INSTALL_DIR" && -z "$KIBANA_INSTALL_DIR" && -d "$KIBANA_INSTALL_DIR" ]]; then + rm -rf "$REMOVE_KIBANA_INSTALL_DIR" + fi +} + +trap 'post_work' EXIT + +export TEST_BROWSER_HEADLESS=1 + +if [[ -n "$IS_PIPELINE_JOB" ]] ; then + source src/dev/ci_setup/setup_env.sh +fi diff --git a/test/scripts/jenkins_visual_regression.sh b/test/scripts/jenkins_visual_regression.sh index fdda24423d977..9ca1c0f08d2c9 100755 --- a/test/scripts/jenkins_visual_regression.sh +++ b/test/scripts/jenkins_visual_regression.sh @@ -1,11 +1,6 @@ #!/usr/bin/env bash -set -e - -if [[ -n "$IS_PIPELINE_JOB" ]] ; then - source src/dev/ci_setup/setup_env.sh -fi - +source test/scripts/jenkins_test_setup.sh source "$KIBANA_DIR/src/dev/ci_setup/setup_percy.sh" if [[ -z "$IS_PIPELINE_JOB" ]] ; then @@ -22,8 +17,6 @@ else export KIBANA_INSTALL_DIR="$destDir" fi -export TEST_BROWSER_HEADLESS=1 - checks-reporter-with-killswitch "Kibana visual regression tests" \ yarn run percy exec -t 500 \ node scripts/functional_tests \ diff --git a/test/scripts/jenkins_xpack_accessibility.sh b/test/scripts/jenkins_xpack_accessibility.sh new file mode 100755 index 0000000000000..af813c3c40f84 --- /dev/null +++ b/test/scripts/jenkins_xpack_accessibility.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env bash + +set -e + +if [[ -n "$IS_PIPELINE_JOB" ]] ; then + source src/dev/ci_setup/setup_env.sh +fi + +if [[ -z "$IS_PIPELINE_JOB" ]] ; then + echo " -> building and extracting default Kibana distributable for use in functional tests" + node scripts/build --debug --no-oss + + linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')" + installDir="$PARENT_DIR/install/kibana" + + mkdir -p "$installDir" + tar -xzf "$linuxBuild" -C "$installDir" --strip=1 + + export KIBANA_INSTALL_DIR="$installDir" +else + installDir="$PARENT_DIR/install/kibana" + destDir="${installDir}-${CI_WORKER_NUMBER}" + cp -R "$installDir" "$destDir" + + export KIBANA_INSTALL_DIR="$destDir" +fi + +export TEST_BROWSER_HEADLESS=1 +cd "$XPACK_DIR" + +checks-reporter-with-killswitch "X-Pack accessibility tests" \ + node scripts/functional_tests \ + --debug --bail \ + --kibana-install-dir "$installDir" \ + --config test/accessibility/config.ts; diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh index 0b9666b33deca..fba05f8f252d7 100755 --- a/test/scripts/jenkins_xpack_ci_group.sh +++ b/test/scripts/jenkins_xpack_ci_group.sh @@ -1,12 +1,6 @@ #!/usr/bin/env bash -set -e - -if [[ -n "$IS_PIPELINE_JOB" ]] ; then - source src/dev/ci_setup/setup_env.sh -fi - -export TEST_BROWSER_HEADLESS=1 +source test/scripts/jenkins_test_setup.sh if [[ -z "$IS_PIPELINE_JOB" ]] ; then echo " -> Ensuring all functional tests are in a ciGroup" diff --git a/test/scripts/jenkins_xpack_firefox_smoke.sh b/test/scripts/jenkins_xpack_firefox_smoke.sh index 18ed468de1317..43220459bcb97 100755 --- a/test/scripts/jenkins_xpack_firefox_smoke.sh +++ b/test/scripts/jenkins_xpack_firefox_smoke.sh @@ -1,10 +1,6 @@ #!/usr/bin/env bash -set -e - -if [[ -n "$IS_PIPELINE_JOB" ]] ; then - source src/dev/ci_setup/setup_env.sh -fi +source test/scripts/jenkins_test_setup.sh if [[ -z "$IS_PIPELINE_JOB" ]] ; then node scripts/build --debug --no-oss; @@ -21,8 +17,6 @@ else export KIBANA_INSTALL_DIR="$destDir" fi -export TEST_BROWSER_HEADLESS=1 - cd "$XPACK_DIR" checks-reporter-with-killswitch "X-Pack firefox smoke test" \ diff --git a/test/scripts/jenkins_xpack_visual_regression.sh b/test/scripts/jenkins_xpack_visual_regression.sh index 0f3275d45f13b..5699f9e5ee7c1 100755 --- a/test/scripts/jenkins_xpack_visual_regression.sh +++ b/test/scripts/jenkins_xpack_visual_regression.sh @@ -1,11 +1,6 @@ #!/usr/bin/env bash -set -e - -if [[ -n "$IS_PIPELINE_JOB" ]] ; then - source src/dev/ci_setup/setup_env.sh -fi - +source test/scripts/jenkins_test_setup.sh source "$KIBANA_DIR/src/dev/ci_setup/setup_percy.sh" if [[ -z "$IS_PIPELINE_JOB" ]] ; then @@ -23,8 +18,6 @@ else export KIBANA_INSTALL_DIR="$destDir" fi -export TEST_BROWSER_HEADLESS=1 - cd "$XPACK_DIR" checks-reporter-with-killswitch "X-Pack visual regression tests" \ diff --git a/test/visual_regression/tests/discover/chart_visualization.js b/test/visual_regression/tests/discover/chart_visualization.js index 5467f2d3eaa14..4e1d9bf643cf6 100644 --- a/test/visual_regression/tests/discover/chart_visualization.js +++ b/test/visual_regression/tests/discover/chart_visualization.js @@ -29,6 +29,7 @@ export default function ({ getService, getPageObjects }) { const visualTesting = getService('visualTesting'); const defaultSettings = { defaultIndex: 'logstash-*', + 'discover:sampleSize': 1 }; describe('discover', function describeIndexTests() { diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json index a678ce90c4cc1..622fbf9a72b68 100644 --- a/x-pack/.i18nrc.json +++ b/x-pack/.i18nrc.json @@ -35,6 +35,7 @@ "xpack.server": "legacy/server", "xpack.snapshotRestore": "legacy/plugins/snapshot_restore", "xpack.spaces": ["legacy/plugins/spaces", "plugins/spaces"], + "xpack.taskManager": "legacy/plugins/task_manager", "xpack.transform": "legacy/plugins/transform", "xpack.upgradeAssistant": "legacy/plugins/upgrade_assistant", "xpack.uptime": "legacy/plugins/uptime", diff --git a/x-pack/legacy/plugins/actions/index.ts b/x-pack/legacy/plugins/actions/index.ts index 7c4dd9f73c11f..a58c936c63749 100644 --- a/x-pack/legacy/plugins/actions/index.ts +++ b/x-pack/legacy/plugins/actions/index.ts @@ -22,10 +22,10 @@ export function actions(kibana: any) { return new kibana.Plugin({ id: 'actions', configPrefix: 'xpack.actions', - require: ['kibana', 'elasticsearch', 'task_manager', 'encrypted_saved_objects'], + require: ['kibana', 'elasticsearch', 'task_manager', 'encryptedSavedObjects'], isEnabled(config: Legacy.KibanaConfig) { return ( - config.get('xpack.encrypted_saved_objects.enabled') === true && + config.get('xpack.encryptedSavedObjects.enabled') === true && config.get('xpack.actions.enabled') === true && config.get('xpack.task_manager.enabled') === true ); diff --git a/x-pack/legacy/plugins/actions/server/actions_client.test.ts b/x-pack/legacy/plugins/actions/server/actions_client.test.ts index b4940b23ba61c..933b7b0b239b6 100644 --- a/x-pack/legacy/plugins/actions/server/actions_client.test.ts +++ b/x-pack/legacy/plugins/actions/server/actions_client.test.ts @@ -11,9 +11,14 @@ import { ActionsClient } from './actions_client'; import { ExecutorType } from './types'; import { ActionExecutor, TaskRunnerFactory } from './lib'; import { taskManagerMock } from '../../task_manager/task_manager.mock'; -import { savedObjectsClientMock } from '../../../../../src/core/server/mocks'; +import { + elasticsearchServiceMock, + savedObjectsClientMock, +} from '../../../../../src/core/server/mocks'; +const defaultKibanaIndex = '.kibana'; const savedObjectsClient = savedObjectsClientMock.create(); +const scopedClusterClient = elasticsearchServiceMock.createScopedClusterClient(); const mockTaskManager = taskManagerMock.create(); @@ -22,11 +27,22 @@ const actionTypeRegistryParams = { taskRunnerFactory: new TaskRunnerFactory(new ActionExecutor()), }; +let actionsClient: ActionsClient; +let actionTypeRegistry: ActionTypeRegistry; const executor: ExecutorType = async options => { return { status: 'ok' }; }; -beforeEach(() => jest.resetAllMocks()); +beforeEach(() => { + jest.resetAllMocks(); + actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams); + actionsClient = new ActionsClient({ + actionTypeRegistry, + savedObjectsClient, + scopedClusterClient, + defaultKibanaIndex, + }); +}); describe('create()', () => { test('creates an action with all given properties', async () => { @@ -40,16 +56,11 @@ describe('create()', () => { }, references: [], }; - const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams); actionTypeRegistry.register({ id: 'my-action-type', name: 'My action type', executor, }); - const actionsClient = new ActionsClient({ - actionTypeRegistry, - savedObjectsClient, - }); savedObjectsClient.create.mockResolvedValueOnce(savedObjectCreateResult); const result = await actionsClient.create({ action: { @@ -80,11 +91,6 @@ describe('create()', () => { }); test('validates config', async () => { - const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams); - const actionsClient = new ActionsClient({ - actionTypeRegistry, - savedObjectsClient, - }); actionTypeRegistry.register({ id: 'my-action-type', name: 'My action type', @@ -110,11 +116,6 @@ describe('create()', () => { }); test(`throws an error when an action type doesn't exist`, async () => { - const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams); - const actionsClient = new ActionsClient({ - actionTypeRegistry, - savedObjectsClient, - }); await expect( actionsClient.create({ action: { @@ -130,16 +131,11 @@ describe('create()', () => { }); test('encrypts action type options unless specified not to', async () => { - const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams); actionTypeRegistry.register({ id: 'my-action-type', name: 'My action type', executor, }); - const actionsClient = new ActionsClient({ - actionTypeRegistry, - savedObjectsClient, - }); savedObjectsClient.create.mockResolvedValueOnce({ id: '1', type: 'type', @@ -198,11 +194,6 @@ describe('create()', () => { describe('get()', () => { test('calls savedObjectsClient with id', async () => { - const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams); - const actionsClient = new ActionsClient({ - actionTypeRegistry, - savedObjectsClient, - }); savedObjectsClient.get.mockResolvedValueOnce({ id: '1', type: 'type', @@ -242,12 +233,12 @@ describe('find()', () => { }, ], }; - const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams); - const actionsClient = new ActionsClient({ - actionTypeRegistry, - savedObjectsClient, - }); savedObjectsClient.find.mockResolvedValueOnce(expectedResult); + scopedClusterClient.callAsInternalUser.mockResolvedValueOnce({ + aggregations: { + '1': { doc_count: 6 }, + }, + }); const result = await actionsClient.find({}); expect(result).toEqual({ total: 1, @@ -259,6 +250,7 @@ describe('find()', () => { config: { foo: 'bar', }, + referencedByCount: 6, }, ], }); @@ -276,11 +268,6 @@ describe('find()', () => { describe('delete()', () => { test('calls savedObjectsClient with id', async () => { const expectedResult = Symbol(); - const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams); - const actionsClient = new ActionsClient({ - actionTypeRegistry, - savedObjectsClient, - }); savedObjectsClient.delete.mockResolvedValueOnce(expectedResult); const result = await actionsClient.delete({ id: '1' }); expect(result).toEqual(expectedResult); @@ -296,16 +283,11 @@ describe('delete()', () => { describe('update()', () => { test('updates an action with all given properties', async () => { - const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams); actionTypeRegistry.register({ id: 'my-action-type', name: 'My action type', executor, }); - const actionsClient = new ActionsClient({ - actionTypeRegistry, - savedObjectsClient, - }); savedObjectsClient.get.mockResolvedValueOnce({ id: '1', type: 'action', @@ -362,11 +344,6 @@ describe('update()', () => { }); test('validates config', async () => { - const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams); - const actionsClient = new ActionsClient({ - actionTypeRegistry, - savedObjectsClient, - }); actionTypeRegistry.register({ id: 'my-action-type', name: 'My action type', @@ -400,16 +377,11 @@ describe('update()', () => { }); test('encrypts action type options unless specified not to', async () => { - const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams); actionTypeRegistry.register({ id: 'my-action-type', name: 'My action type', executor, }); - const actionsClient = new ActionsClient({ - actionTypeRegistry, - savedObjectsClient, - }); savedObjectsClient.get.mockResolvedValueOnce({ id: 'my-action', type: 'action', diff --git a/x-pack/legacy/plugins/actions/server/actions_client.ts b/x-pack/legacy/plugins/actions/server/actions_client.ts index 823cb55abaf5e..1e4135bd0d66f 100644 --- a/x-pack/legacy/plugins/actions/server/actions_client.ts +++ b/x-pack/legacy/plugins/actions/server/actions_client.ts @@ -4,10 +4,16 @@ * you may not use this file except in compliance with the Elastic License. */ -import { SavedObjectsClientContract, SavedObjectAttributes, SavedObject } from 'src/core/server'; +import { + IScopedClusterClient, + SavedObjectsClientContract, + SavedObjectAttributes, + SavedObject, +} from 'src/core/server'; + import { ActionTypeRegistry } from './action_type_registry'; import { validateConfig, validateSecrets } from './lib'; -import { ActionResult } from './types'; +import { ActionResult, FindActionResult, RawAction } from './types'; interface ActionUpdate extends SavedObjectAttributes { description: string; @@ -44,10 +50,12 @@ interface FindResult { page: number; perPage: number; total: number; - data: ActionResult[]; + data: FindActionResult[]; } interface ConstructorOptions { + defaultKibanaIndex: string; + scopedClusterClient: IScopedClusterClient; actionTypeRegistry: ActionTypeRegistry; savedObjectsClient: SavedObjectsClientContract; } @@ -58,12 +66,21 @@ interface UpdateOptions { } export class ActionsClient { + private readonly defaultKibanaIndex: string; + private readonly scopedClusterClient: IScopedClusterClient; private readonly savedObjectsClient: SavedObjectsClientContract; private readonly actionTypeRegistry: ActionTypeRegistry; - constructor({ actionTypeRegistry, savedObjectsClient }: ConstructorOptions) { + constructor({ + actionTypeRegistry, + defaultKibanaIndex, + scopedClusterClient, + savedObjectsClient, + }: ConstructorOptions) { this.actionTypeRegistry = actionTypeRegistry; this.savedObjectsClient = savedObjectsClient; + this.scopedClusterClient = scopedClusterClient; + this.defaultKibanaIndex = defaultKibanaIndex; } /** @@ -134,16 +151,22 @@ export class ActionsClient { * Find actions */ public async find({ options = {} }: FindOptions): Promise { - const findResult = await this.savedObjectsClient.find({ + const findResult = await this.savedObjectsClient.find({ ...options, type: 'action', }); + const data = await injectExtraFindData( + this.defaultKibanaIndex, + this.scopedClusterClient, + findResult.saved_objects.map(actionFromSavedObject) + ); + return { page: findResult.page, perPage: findResult.per_page, total: findResult.total, - data: findResult.saved_objects.map(actionFromSavedObject), + data, }; } @@ -155,9 +178,64 @@ export class ActionsClient { } } -function actionFromSavedObject(savedObject: SavedObject) { +function actionFromSavedObject(savedObject: SavedObject): ActionResult { return { id: savedObject.id, ...savedObject.attributes, }; } + +async function injectExtraFindData( + defaultKibanaIndex: string, + scopedClusterClient: IScopedClusterClient, + actionResults: ActionResult[] +): Promise { + const aggs: Record = {}; + for (const actionResult of actionResults) { + aggs[actionResult.id] = { + filter: { + bool: { + must: { + nested: { + path: 'references', + query: { + bool: { + filter: { + bool: { + must: [ + { + term: { + 'references.id': actionResult.id, + }, + }, + { + term: { + 'references.type': 'action', + }, + }, + ], + }, + }, + }, + }, + }, + }, + }, + }, + }; + } + const aggregationResult = await scopedClusterClient.callAsInternalUser('search', { + index: defaultKibanaIndex, + body: { + aggs, + size: 0, + query: { + match_all: {}, + }, + }, + }); + return actionResults.map(actionResult => ({ + ...actionResult, + referencedByCount: aggregationResult.aggregations[actionResult.id].doc_count, + })); +} diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/result_type.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/result_type.ts index c891f3bf218e7..256463251315d 100644 --- a/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/result_type.ts +++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/result_type.ts @@ -8,16 +8,15 @@ // Which is basically the Haskel equivalent of Rust/ML/Scala's Result // I'll reach out to other's in Kibana to see if we can merge these into one type -// eslint-disable-next-line @typescript-eslint/consistent-type-definitions -export type Ok = { +export interface Ok { tag: 'ok'; value: T; -}; -// eslint-disable-next-line @typescript-eslint/consistent-type-definitions -export type Err = { +} + +export interface Err { tag: 'err'; error: E; -}; +} export type Result = Ok | Err; export function asOk(value: T): Ok { diff --git a/x-pack/legacy/plugins/actions/server/lib/action_executor.test.ts b/x-pack/legacy/plugins/actions/server/lib/action_executor.test.ts index c724717bef9eb..5ed67ae82b0ce 100644 --- a/x-pack/legacy/plugins/actions/server/lib/action_executor.test.ts +++ b/x-pack/legacy/plugins/actions/server/lib/action_executor.test.ts @@ -8,7 +8,7 @@ import Hapi from 'hapi'; import { schema } from '@kbn/config-schema'; import { ActionExecutor } from './action_executor'; import { actionTypeRegistryMock } from '../action_type_registry.mock'; -import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/plugin.mock'; +import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks'; import { savedObjectsClientMock, loggingServiceMock, @@ -24,7 +24,7 @@ function getServices() { callCluster: jest.fn(), }; } -const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.create(); +const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.createStart(); const actionTypeRegistry = actionTypeRegistryMock.create(); const executeParams = { diff --git a/x-pack/legacy/plugins/actions/server/lib/action_executor.ts b/x-pack/legacy/plugins/actions/server/lib/action_executor.ts index aef389262f884..b7d4ea96ea0f8 100644 --- a/x-pack/legacy/plugins/actions/server/lib/action_executor.ts +++ b/x-pack/legacy/plugins/actions/server/lib/action_executor.ts @@ -5,7 +5,7 @@ */ import Hapi from 'hapi'; -import { EncryptedSavedObjectsStartContract } from '../shim'; +import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server'; import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../../spaces'; import { Logger } from '../../../../../../src/core/server'; import { validateParams, validateConfig, validateSecrets } from './validate_with_schema'; diff --git a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts index 6411bc7462c9f..3e71725713070 100644 --- a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts +++ b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts @@ -11,7 +11,7 @@ import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager'; import { TaskRunnerFactory } from './task_runner_factory'; import { actionTypeRegistryMock } from '../action_type_registry.mock'; import { actionExecutorMock } from './action_executor.mock'; -import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/plugin.mock'; +import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks'; import { savedObjectsClientMock, loggingServiceMock, @@ -19,7 +19,7 @@ import { const spaceIdToNamespace = jest.fn(); const actionTypeRegistry = actionTypeRegistryMock.create(); -const mockedEncryptedSavedObjectsPlugin = encryptedSavedObjectsMock.create(); +const mockedEncryptedSavedObjectsPlugin = encryptedSavedObjectsMock.createStart(); const mockedActionExecutor = actionExecutorMock.create(); let fakeTimer: sinon.SinonFakeTimers; diff --git a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts index efe9ce7fa8be5..c0cca22b2c3eb 100644 --- a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts +++ b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts @@ -7,7 +7,7 @@ import { ActionExecutorContract } from './action_executor'; import { ExecutorError } from './executor_error'; import { RunContext } from '../../../task_manager'; -import { EncryptedSavedObjectsStartContract } from '../shim'; +import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server'; import { ActionTaskParams, GetBasePathFunction, SpaceIdToNamespaceFunction } from '../types'; export interface TaskRunnerContext { diff --git a/x-pack/legacy/plugins/actions/server/plugin.ts b/x-pack/legacy/plugins/actions/server/plugin.ts index 618c1d120c37a..26b65b1a1689a 100644 --- a/x-pack/legacy/plugins/actions/server/plugin.ts +++ b/x-pack/legacy/plugins/actions/server/plugin.ts @@ -22,6 +22,7 @@ import { ActionsCoreStart, ActionsPluginsSetup, ActionsPluginsStart, + KibanaConfig, } from './shim'; import { createActionRoute, @@ -44,6 +45,7 @@ export interface PluginStartContract { } export class Plugin { + private readonly kibana$: Observable; private readonly config$: Observable; private readonly logger: Logger; private serverBasePath?: string; @@ -51,10 +53,12 @@ export class Plugin { private taskRunnerFactory?: TaskRunnerFactory; private actionTypeRegistry?: ActionTypeRegistry; private actionExecutor?: ActionExecutor; + private defaultKibanaIndex?: string; constructor(initializerContext: ActionsPluginInitializerContext) { this.logger = initializerContext.logger.get('plugins', 'alerting'); this.config$ = initializerContext.config.create(); + this.kibana$ = initializerContext.config.kibana$; } public async setup( @@ -63,6 +67,7 @@ export class Plugin { ): Promise { const config = await this.config$.pipe(first()).toPromise(); this.adminClient = await core.elasticsearch.adminClient$.pipe(first()).toPromise(); + this.defaultKibanaIndex = (await this.kibana$.pipe(first()).toPromise()).index; plugins.xpack_main.registerFeature({ id: 'actions', @@ -92,12 +97,12 @@ export class Plugin { // - `secrets` properties will be encrypted // - `config` will be included in AAD // - everything else excluded from AAD - plugins.encrypted_saved_objects.registerType({ + plugins.encryptedSavedObjects.registerType({ type: 'action', attributesToEncrypt: new Set(['secrets']), attributesToExcludeFromAAD: new Set(['description']), }); - plugins.encrypted_saved_objects.registerType({ + plugins.encryptedSavedObjects.registerType({ type: 'action_task_params', attributesToEncrypt: new Set(['apiKey']), }); @@ -141,6 +146,7 @@ export class Plugin { adminClient, serverBasePath, taskRunnerFactory, + defaultKibanaIndex, } = this; function getServices(request: any): Services { @@ -163,11 +169,11 @@ export class Plugin { logger, spaces: plugins.spaces, getServices, - encryptedSavedObjectsPlugin: plugins.encrypted_saved_objects, + encryptedSavedObjectsPlugin: plugins.encryptedSavedObjects, actionTypeRegistry: actionTypeRegistry!, }); taskRunnerFactory!.initialize({ - encryptedSavedObjectsPlugin: plugins.encrypted_saved_objects, + encryptedSavedObjectsPlugin: plugins.encryptedSavedObjects, getBasePath, spaceIdToNamespace, }); @@ -186,6 +192,8 @@ export class Plugin { return new ActionsClient({ savedObjectsClient, actionTypeRegistry: actionTypeRegistry!, + defaultKibanaIndex: defaultKibanaIndex!, + scopedClusterClient: adminClient!.asScoped(request), }); }, }; diff --git a/x-pack/legacy/plugins/actions/server/routes/_mock_server.ts b/x-pack/legacy/plugins/actions/server/routes/_mock_server.ts index 7f2341c1aa010..23356cedb3ab8 100644 --- a/x-pack/legacy/plugins/actions/server/routes/_mock_server.ts +++ b/x-pack/legacy/plugins/actions/server/routes/_mock_server.ts @@ -8,7 +8,7 @@ import Hapi from 'hapi'; import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks'; import { actionsClientMock } from '../actions_client.mock'; import { actionTypeRegistryMock } from '../action_type_registry.mock'; -import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/plugin.mock'; +import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks'; const defaultConfig = { 'kibana.index': '.kibana', @@ -22,7 +22,8 @@ export function createMockServer(config: Record = defaultConfig) { const actionsClient = actionsClientMock.create(); const actionTypeRegistry = actionTypeRegistryMock.create(); const savedObjectsClient = savedObjectsClientMock.create(); - const encryptedSavedObjects = encryptedSavedObjectsMock.create(); + const encryptedSavedObjectsSetup = encryptedSavedObjectsMock.createSetup(); + const encryptedSavedObjectsStart = encryptedSavedObjectsMock.createStart(); server.config = () => { return { @@ -49,21 +50,16 @@ export function createMockServer(config: Record = defaultConfig) { }, }); - server.register({ - name: 'encrypted_saved_objects', - register(pluginServer: Hapi.Server) { - pluginServer.expose('isEncryptionError', encryptedSavedObjects.isEncryptionError); - pluginServer.expose('registerType', encryptedSavedObjects.registerType); - pluginServer.expose( - 'getDecryptedAsInternalUser', - encryptedSavedObjects.getDecryptedAsInternalUser - ); - }, - }); - server.decorate('request', 'getSavedObjectsClient', () => savedObjectsClient); server.decorate('request', 'getActionsClient', () => actionsClient); server.decorate('request', 'getBasePath', () => '/s/my-space'); - return { server, savedObjectsClient, actionsClient, actionTypeRegistry, encryptedSavedObjects }; + return { + server, + savedObjectsClient, + actionsClient, + actionTypeRegistry, + encryptedSavedObjectsSetup, + encryptedSavedObjectsStart, + }; } diff --git a/x-pack/legacy/plugins/actions/server/shim.ts b/x-pack/legacy/plugins/actions/server/shim.ts index c457a40a78b67..0da6b84f2cc69 100644 --- a/x-pack/legacy/plugins/actions/server/shim.ts +++ b/x-pack/legacy/plugins/actions/server/shim.ts @@ -12,7 +12,10 @@ import { TaskManager } from '../../task_manager'; import { XPackMainPlugin } from '../../xpack_main/xpack_main'; import KbnServer from '../../../../../src/legacy/server/kbn_server'; import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../spaces'; -import { EncryptedSavedObjectsPlugin } from '../../encrypted_saved_objects'; +import { + PluginSetupContract as EncryptedSavedObjectsSetupContract, + PluginStartContract as EncryptedSavedObjectsStartContract, +} from '../../../../plugins/encrypted_saved_objects/server'; import { PluginSetupContract as SecurityPlugin } from '../../../../plugins/security/server'; import { CoreSetup, @@ -24,13 +27,16 @@ import { // due to being marked as dependencies interface Plugins extends Hapi.PluginProperties { task_manager: TaskManager; - encrypted_saved_objects: EncryptedSavedObjectsPlugin; } export interface Server extends Legacy.Server { plugins: Plugins; } +export interface KibanaConfig { + index: string; +} + /** * Shim what we're thinking setup and start contracts will look like */ @@ -38,15 +44,10 @@ export type TaskManagerStartContract = Pick; export type SecurityPluginSetupContract = Pick; export type SecurityPluginStartContract = Pick; -export type EncryptedSavedObjectsSetupContract = Pick; export type TaskManagerSetupContract = Pick< TaskManager, 'addMiddleware' | 'registerTaskDefinitions' >; -export type EncryptedSavedObjectsStartContract = Pick< - EncryptedSavedObjectsPlugin, - 'isEncryptionError' | 'getDecryptedAsInternalUser' ->; /** * New platform interfaces @@ -54,6 +55,7 @@ export type EncryptedSavedObjectsStartContract = Pick< export interface ActionsPluginInitializerContext { logger: LoggerFactory; config: { + kibana$: Rx.Observable; create(): Rx.Observable; }; } @@ -73,12 +75,12 @@ export interface ActionsPluginsSetup { security?: SecurityPluginSetupContract; task_manager: TaskManagerSetupContract; xpack_main: XPackMainPluginSetupContract; - encrypted_saved_objects: EncryptedSavedObjectsSetupContract; + encryptedSavedObjects: EncryptedSavedObjectsSetupContract; } export interface ActionsPluginsStart { security?: SecurityPluginStartContract; spaces: () => SpacesPluginStartContract | undefined; - encrypted_saved_objects: EncryptedSavedObjectsStartContract; + encryptedSavedObjects: EncryptedSavedObjectsStartContract; task_manager: TaskManagerStartContract; } @@ -101,6 +103,9 @@ export function shim( const initializerContext: ActionsPluginInitializerContext = { logger: newPlatform.coreContext.logger, config: { + kibana$: Rx.of({ + index: server.config().get('kibana.index'), + }), create() { return Rx.of({ enabled: server.config().get('xpack.actions.enabled') as boolean, @@ -126,7 +131,8 @@ export function shim( security: newPlatform.setup.plugins.security as SecurityPluginSetupContract | undefined, task_manager: server.plugins.task_manager, xpack_main: server.plugins.xpack_main, - encrypted_saved_objects: server.plugins.encrypted_saved_objects, + encryptedSavedObjects: newPlatform.setup.plugins + .encryptedSavedObjects as EncryptedSavedObjectsSetupContract, }; const pluginsStart: ActionsPluginsStart = { @@ -134,7 +140,8 @@ export function shim( // TODO: Currently a function because it's an optional dependency that // initializes after this function is called spaces: () => server.plugins.spaces, - encrypted_saved_objects: server.plugins.encrypted_saved_objects, + encryptedSavedObjects: newPlatform.start.plugins + .encryptedSavedObjects as EncryptedSavedObjectsStartContract, task_manager: server.plugins.task_manager, }; diff --git a/x-pack/legacy/plugins/actions/server/types.ts b/x-pack/legacy/plugins/actions/server/types.ts index 9db89aea1b38d..1ee5022338a46 100644 --- a/x-pack/legacy/plugins/actions/server/types.ts +++ b/x-pack/legacy/plugins/actions/server/types.ts @@ -45,6 +45,10 @@ export interface ActionResult { config: Record; } +export interface FindActionResult extends ActionResult { + referencedByCount: number; +} + // the result returned from an action type executor function export interface ActionTypeExecutorResult { status: 'ok' | 'error'; diff --git a/x-pack/legacy/plugins/alerting/README.md b/x-pack/legacy/plugins/alerting/README.md index ffe3185328abd..1b90cb78d870c 100644 --- a/x-pack/legacy/plugins/alerting/README.md +++ b/x-pack/legacy/plugins/alerting/README.md @@ -198,6 +198,7 @@ Payload: |Property|Description|Type| |---|---|---| |enabled|Indicate if you want the alert to start executing on an interval basis after it has been created.|boolean| +|name|A name to reference and search in the future.|string| |alertTypeId|The id value of the alert type you want to call when the alert is scheduled to execute.|string| |interval|The interval in seconds, minutes, hours or days the alert should execute. Example: `10s`, `5m`, `1h`, `1d`.|string| |alertTypeParams|The parameters to pass in to the alert type executor `params` value. This will also validate against the alert type params validator if defined.|object| @@ -242,6 +243,7 @@ Payload: |Property|Description|Type| |---|---|---| |interval|The interval in seconds, minutes, hours or days the alert should execute. Example: `10s`, `5m`, `1h`, `1d`.|string| +|name|A name to reference and search in the future.|string| |alertTypeParams|The parameters to pass in to the alert type executor `params` value. This will also validate against the alert type params validator if defined.|object| |actions|Array of the following:
- `group` (string): We support grouping actions in the scenario of escalations or different types of alert instances. If you don't need this, feel free to use `default` as a value.
- `id` (string): The id of the action saved object to execute.
- `params` (object): There map to the `params` the action type will receive. In order to help apply context to strings, we handle them as mustache templates and pass in a default set of context. (see templating actions).|array| diff --git a/x-pack/legacy/plugins/alerting/index.ts b/x-pack/legacy/plugins/alerting/index.ts index 22db92baa8d28..b3e33f782688c 100644 --- a/x-pack/legacy/plugins/alerting/index.ts +++ b/x-pack/legacy/plugins/alerting/index.ts @@ -22,12 +22,12 @@ export function alerting(kibana: any) { return new kibana.Plugin({ id: 'alerting', configPrefix: 'xpack.alerting', - require: ['kibana', 'elasticsearch', 'actions', 'task_manager', 'encrypted_saved_objects'], + require: ['kibana', 'elasticsearch', 'actions', 'task_manager', 'encryptedSavedObjects'], isEnabled(config: Legacy.KibanaConfig) { return ( config.get('xpack.alerting.enabled') === true && config.get('xpack.actions.enabled') === true && - config.get('xpack.encrypted_saved_objects.enabled') === true && + config.get('xpack.encryptedSavedObjects.enabled') === true && config.get('xpack.task_manager.enabled') === true ); }, diff --git a/x-pack/legacy/plugins/alerting/mappings.json b/x-pack/legacy/plugins/alerting/mappings.json index bc648e874cfa4..ff60ccc98cbaa 100644 --- a/x-pack/legacy/plugins/alerting/mappings.json +++ b/x-pack/legacy/plugins/alerting/mappings.json @@ -4,6 +4,9 @@ "enabled": { "type": "boolean" }, + "name": { + "type": "text" + }, "alertTypeId": { "type": "keyword" }, diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts b/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts index 093f5f7484004..99af7db2ef8d7 100644 --- a/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts +++ b/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts @@ -43,6 +43,7 @@ const mockedDate = new Date('2019-02-12T21:01:22.479Z'); function getMockData(overwrites: Record = {}) { return { enabled: true, + name: 'abc', alertTypeId: '123', interval: '10s', throttle: null, @@ -172,6 +173,7 @@ describe('create()', () => { "interval": "10s", "muteAll": false, "mutedInstanceIds": Array [], + "name": "abc", "throttle": null, "updatedBy": "elastic", } @@ -504,6 +506,7 @@ describe('create()', () => { }, ], alertTypeId: '123', + name: 'abc', alertTypeParams: { bar: true }, apiKey: Buffer.from('123:abc').toString('base64'), apiKeyOwner: 'elastic', @@ -1173,6 +1176,7 @@ describe('update()', () => { id: '1', data: { interval: '10s', + name: 'abc', alertTypeParams: { bar: true, }, @@ -1230,6 +1234,7 @@ describe('update()', () => { "apiKeyOwner": null, "enabled": true, "interval": "10s", + "name": "abc", "scheduledTaskId": "task-123", "updatedBy": "elastic", } @@ -1304,6 +1309,7 @@ describe('update()', () => { id: '1', data: { interval: '10s', + name: 'abc', alertTypeParams: { bar: true, }, @@ -1362,6 +1368,7 @@ describe('update()', () => { "apiKeyOwner": "elastic", "enabled": true, "interval": "10s", + "name": "abc", "scheduledTaskId": "task-123", "updatedBy": "elastic", } @@ -1406,6 +1413,7 @@ describe('update()', () => { id: '1', data: { interval: '10s', + name: 'abc', alertTypeParams: { bar: true, }, diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client.ts b/x-pack/legacy/plugins/alerting/server/alerts_client.ts index 39d0277ff53b3..b92af43a1f1c6 100644 --- a/x-pack/legacy/plugins/alerting/server/alerts_client.ts +++ b/x-pack/legacy/plugins/alerting/server/alerts_client.ts @@ -72,6 +72,7 @@ interface CreateOptions { interface UpdateOptions { id: string; data: { + name: string; interval: string; actions: AlertAction[]; alertTypeParams: Record; diff --git a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.test.ts b/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.test.ts index 23591692bca1f..dcc74ed9488ce 100644 --- a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.test.ts +++ b/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.test.ts @@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema'; import { AlertExecutorOptions } from '../types'; import { ConcreteTaskInstance } from '../../../task_manager'; import { TaskRunnerContext, TaskRunnerFactory } from './task_runner_factory'; -import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/plugin.mock'; +import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks'; import { savedObjectsClientMock, loggingServiceMock, @@ -52,7 +52,7 @@ beforeAll(() => { afterAll(() => fakeTimer.restore()); const savedObjectsClient = savedObjectsClientMock.create(); -const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.create(); +const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.createStart(); const services = { log: jest.fn(), callCluster: jest.fn(), diff --git a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.ts b/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.ts index ca11dc8533996..0c6bd1b4a777a 100644 --- a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.ts +++ b/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.ts @@ -11,7 +11,7 @@ import { createAlertInstanceFactory } from './create_alert_instance_factory'; import { AlertInstance } from './alert_instance'; import { getNextRunAt } from './get_next_run_at'; import { validateAlertTypeParams } from './validate_alert_type_params'; -import { EncryptedSavedObjectsStartContract } from '../shim'; +import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server'; import { PluginStartContract as ActionsPluginStartContract } from '../../../actions'; import { AlertType, diff --git a/x-pack/legacy/plugins/alerting/server/plugin.ts b/x-pack/legacy/plugins/alerting/server/plugin.ts index d6c6d5907e7ac..c50bc795757f3 100644 --- a/x-pack/legacy/plugins/alerting/server/plugin.ts +++ b/x-pack/legacy/plugins/alerting/server/plugin.ts @@ -85,7 +85,7 @@ export class Plugin { }); // Encrypted attributes - plugins.encrypted_saved_objects.registerType({ + plugins.encryptedSavedObjects.registerType({ type: 'alert', attributesToEncrypt: new Set(['apiKey']), attributesToExcludeFromAAD: new Set([ @@ -147,7 +147,7 @@ export class Plugin { }; }, executeAction: plugins.actions.execute, - encryptedSavedObjectsPlugin: plugins.encrypted_saved_objects, + encryptedSavedObjectsPlugin: plugins.encryptedSavedObjects, spaceIdToNamespace(spaceId?: string): string | undefined { const spacesPlugin = plugins.spaces(); return spacesPlugin && spaceId ? spacesPlugin.spaceIdToNamespace(spaceId) : undefined; diff --git a/x-pack/legacy/plugins/alerting/server/routes/create.test.ts b/x-pack/legacy/plugins/alerting/server/routes/create.test.ts index 3751aa968b3de..bd153150849c8 100644 --- a/x-pack/legacy/plugins/alerting/server/routes/create.test.ts +++ b/x-pack/legacy/plugins/alerting/server/routes/create.test.ts @@ -12,6 +12,7 @@ server.route(createAlertRoute); const mockedAlert = { alertTypeId: '1', + name: 'abc', interval: '10s', alertTypeParams: { bar: true, @@ -44,24 +45,25 @@ test('creates an alert with proper parameters', async () => { expect(statusCode).toBe(200); const response = JSON.parse(payload); expect(response).toMatchInlineSnapshot(` + Object { + "actions": Array [ Object { - "actions": Array [ - Object { - "group": "default", - "id": "2", - "params": Object { - "foo": true, - }, - }, - ], - "alertTypeId": "1", - "alertTypeParams": Object { - "bar": true, + "group": "default", + "id": "2", + "params": Object { + "foo": true, }, - "id": "123", - "interval": "10s", - } - `); + }, + ], + "alertTypeId": "1", + "alertTypeParams": Object { + "bar": true, + }, + "id": "123", + "interval": "10s", + "name": "abc", + } + `); expect(alertsClient.create).toHaveBeenCalledTimes(1); expect(alertsClient.create.mock.calls[0]).toMatchInlineSnapshot(` Array [ @@ -82,6 +84,7 @@ test('creates an alert with proper parameters', async () => { }, "enabled": true, "interval": "10s", + "name": "abc", "throttle": null, }, }, @@ -107,6 +110,7 @@ test('creates an alert with proper parameters', async () => { }, "enabled": true, "interval": "10s", + "name": "abc", "throttle": null, }, }, diff --git a/x-pack/legacy/plugins/alerting/server/routes/create.ts b/x-pack/legacy/plugins/alerting/server/routes/create.ts index 984153d81e0f8..14f72b0041e76 100644 --- a/x-pack/legacy/plugins/alerting/server/routes/create.ts +++ b/x-pack/legacy/plugins/alerting/server/routes/create.ts @@ -12,6 +12,7 @@ import { getDurationSchema } from '../lib'; interface ScheduleRequest extends Hapi.Request { payload: { enabled: boolean; + name: string; alertTypeId: string; interval: string; actions: AlertAction[]; @@ -32,6 +33,7 @@ export const createAlertRoute = { payload: Joi.object() .keys({ enabled: Joi.boolean().default(true), + name: Joi.string().required(), alertTypeId: Joi.string().required(), throttle: getDurationSchema().default(null), interval: getDurationSchema().required(), diff --git a/x-pack/legacy/plugins/alerting/server/routes/update.test.ts b/x-pack/legacy/plugins/alerting/server/routes/update.test.ts index 9e4f18fa1b40d..2237d8245097c 100644 --- a/x-pack/legacy/plugins/alerting/server/routes/update.test.ts +++ b/x-pack/legacy/plugins/alerting/server/routes/update.test.ts @@ -36,6 +36,7 @@ test('calls the update function with proper parameters', async () => { url: '/api/alert/1', payload: { throttle: null, + name: 'abc', interval: '12s', alertTypeParams: { otherField: false, @@ -75,6 +76,7 @@ test('calls the update function with proper parameters', async () => { "otherField": false, }, "interval": "12s", + "name": "abc", "throttle": null, }, "id": "1", diff --git a/x-pack/legacy/plugins/alerting/server/routes/update.ts b/x-pack/legacy/plugins/alerting/server/routes/update.ts index 2b95b7bc34054..09362295ae73b 100644 --- a/x-pack/legacy/plugins/alerting/server/routes/update.ts +++ b/x-pack/legacy/plugins/alerting/server/routes/update.ts @@ -15,6 +15,7 @@ interface UpdateRequest extends Hapi.Request { }; payload: { alertTypeId: string; + name: string; interval: string; actions: AlertAction[]; alertTypeParams: Record; @@ -36,6 +37,7 @@ export const updateAlertRoute = { throttle: getDurationSchema() .required() .allow(null), + name: Joi.string().required(), interval: getDurationSchema().required(), alertTypeParams: Joi.object().required(), actions: Joi.array() diff --git a/x-pack/legacy/plugins/alerting/server/shim.ts b/x-pack/legacy/plugins/alerting/server/shim.ts index c977fda451df1..d86eab2038095 100644 --- a/x-pack/legacy/plugins/alerting/server/shim.ts +++ b/x-pack/legacy/plugins/alerting/server/shim.ts @@ -10,7 +10,10 @@ import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../spaces'; import { TaskManager } from '../../task_manager'; import { XPackMainPlugin } from '../../xpack_main/xpack_main'; import KbnServer from '../../../../../src/legacy/server/kbn_server'; -import { EncryptedSavedObjectsPlugin } from '../../encrypted_saved_objects'; +import { + PluginSetupContract as EncryptedSavedObjectsSetupContract, + PluginStartContract as EncryptedSavedObjectsStartContract, +} from '../../../../plugins/encrypted_saved_objects/server'; import { PluginSetupContract as SecurityPlugin } from '../../../../plugins/security/server'; import { CoreSetup, @@ -28,7 +31,6 @@ import { interface Plugins extends Hapi.PluginProperties { actions: ActionsPlugin; task_manager: TaskManager; - encrypted_saved_objects: EncryptedSavedObjectsPlugin; } export interface Server extends Legacy.Server { @@ -41,16 +43,11 @@ export interface Server extends Legacy.Server { export type TaskManagerStartContract = Pick; export type SecurityPluginSetupContract = Pick; export type SecurityPluginStartContract = Pick; -export type EncryptedSavedObjectsSetupContract = Pick; export type XPackMainPluginSetupContract = Pick; export type TaskManagerSetupContract = Pick< TaskManager, 'addMiddleware' | 'registerTaskDefinitions' >; -export type EncryptedSavedObjectsStartContract = Pick< - EncryptedSavedObjectsPlugin, - 'isEncryptionError' | 'getDecryptedAsInternalUser' ->; /** * New platform interfaces @@ -75,13 +72,13 @@ export interface AlertingPluginsSetup { task_manager: TaskManagerSetupContract; actions: ActionsPluginSetupContract; xpack_main: XPackMainPluginSetupContract; - encrypted_saved_objects: EncryptedSavedObjectsSetupContract; + encryptedSavedObjects: EncryptedSavedObjectsSetupContract; } export interface AlertingPluginsStart { actions: ActionsPluginStartContract; security?: SecurityPluginStartContract; spaces: () => SpacesPluginStartContract | undefined; - encrypted_saved_objects: EncryptedSavedObjectsStartContract; + encryptedSavedObjects: EncryptedSavedObjectsStartContract; task_manager: TaskManagerStartContract; } @@ -122,7 +119,8 @@ export function shim( task_manager: server.plugins.task_manager, actions: server.plugins.actions.setup, xpack_main: server.plugins.xpack_main, - encrypted_saved_objects: server.plugins.encrypted_saved_objects, + encryptedSavedObjects: newPlatform.setup.plugins + .encryptedSavedObjects as EncryptedSavedObjectsSetupContract, }; const pluginsStart: AlertingPluginsStart = { @@ -131,7 +129,8 @@ export function shim( // TODO: Currently a function because it's an optional dependency that // initializes after this function is called spaces: () => server.plugins.spaces, - encrypted_saved_objects: server.plugins.encrypted_saved_objects, + encryptedSavedObjects: newPlatform.start.plugins + .encryptedSavedObjects as EncryptedSavedObjectsStartContract, task_manager: server.plugins.task_manager, }; diff --git a/x-pack/legacy/plugins/alerting/server/types.ts b/x-pack/legacy/plugins/alerting/server/types.ts index 3c71412da2c89..94b81c9e1b576 100644 --- a/x-pack/legacy/plugins/alerting/server/types.ts +++ b/x-pack/legacy/plugins/alerting/server/types.ts @@ -60,6 +60,7 @@ export interface RawAlertAction extends SavedObjectAttributes { export interface Alert { enabled: boolean; + name: string; alertTypeId: string; interval: string; actions: AlertAction[]; @@ -76,6 +77,7 @@ export interface Alert { export interface RawAlert extends SavedObjectAttributes { enabled: boolean; + name: string; alertTypeId: string; interval: string; actions: RawAlertAction[]; diff --git a/x-pack/legacy/plugins/apm/common/projections/errors.ts b/x-pack/legacy/plugins/apm/common/projections/errors.ts index c3094f5cbb0b6..adbd2eb1d6d27 100644 --- a/x-pack/legacy/plugins/apm/common/projections/errors.ts +++ b/x-pack/legacy/plugins/apm/common/projections/errors.ts @@ -19,10 +19,10 @@ export function getErrorGroupsProjection({ setup: Setup; serviceName: string; }) { - const { start, end, uiFiltersES, config } = setup; + const { start, end, uiFiltersES, indices } = setup; return { - index: config.get('apm_oss.errorIndices'), + index: indices['apm_oss.errorIndices'], body: { query: { bool: { diff --git a/x-pack/legacy/plugins/apm/common/projections/metrics.ts b/x-pack/legacy/plugins/apm/common/projections/metrics.ts index 5c9eeb54744d7..25d1484624e15 100644 --- a/x-pack/legacy/plugins/apm/common/projections/metrics.ts +++ b/x-pack/legacy/plugins/apm/common/projections/metrics.ts @@ -34,7 +34,7 @@ export function getMetricsProjection({ serviceName: string; serviceNodeName?: string; }) { - const { start, end, uiFiltersES, config } = setup; + const { start, end, uiFiltersES, indices } = setup; const filter = [ { term: { [SERVICE_NAME]: serviceName } }, @@ -45,7 +45,7 @@ export function getMetricsProjection({ ]; return { - index: config.get('apm_oss.metricsIndices'), + index: indices['apm_oss.metricsIndices'], body: { query: { bool: { diff --git a/x-pack/legacy/plugins/apm/common/projections/services.ts b/x-pack/legacy/plugins/apm/common/projections/services.ts index ab72211f92aa7..e889899e11634 100644 --- a/x-pack/legacy/plugins/apm/common/projections/services.ts +++ b/x-pack/legacy/plugins/apm/common/projections/services.ts @@ -9,13 +9,13 @@ import { SERVICE_NAME, PROCESSOR_EVENT } from '../elasticsearch_fieldnames'; import { rangeFilter } from '../../server/lib/helpers/range_filter'; export function getServicesProjection({ setup }: { setup: Setup }) { - const { start, end, uiFiltersES, config } = setup; + const { start, end, uiFiltersES, indices } = setup; return { index: [ - config.get('apm_oss.metricsIndices'), - config.get('apm_oss.errorIndices'), - config.get('apm_oss.transactionIndices') + indices['apm_oss.metricsIndices'], + indices['apm_oss.errorIndices'], + indices['apm_oss.transactionIndices'] ], body: { size: 0, diff --git a/x-pack/legacy/plugins/apm/common/projections/transactions.ts b/x-pack/legacy/plugins/apm/common/projections/transactions.ts index 63abb0572df87..fb249340c867c 100644 --- a/x-pack/legacy/plugins/apm/common/projections/transactions.ts +++ b/x-pack/legacy/plugins/apm/common/projections/transactions.ts @@ -24,7 +24,7 @@ export function getTransactionsProjection({ transactionName?: string; transactionType?: string; }) { - const { start, end, uiFiltersES, config } = setup; + const { start, end, uiFiltersES, indices } = setup; const transactionNameFilter = transactionName ? [{ term: { [TRANSACTION_NAME]: transactionName } }] @@ -48,7 +48,7 @@ export function getTransactionsProjection({ }; return { - index: config.get('apm_oss.transactionIndices'), + index: indices['apm_oss.transactionIndices'], body: { query: { bool diff --git a/x-pack/legacy/plugins/apm/index.ts b/x-pack/legacy/plugins/apm/index.ts index 4d3d2b210bbae..556bce9d37bb5 100644 --- a/x-pack/legacy/plugins/apm/index.ts +++ b/x-pack/legacy/plugins/apm/index.ts @@ -43,8 +43,7 @@ export const apm: LegacyPluginInitializer = kibana => { apmUiEnabled: config.get('xpack.apm.ui.enabled'), // TODO: rename to apm_oss.indexPatternTitle in 7.0 (breaking change) apmIndexPatternTitle: config.get('apm_oss.indexPattern'), - apmServiceMapEnabled: config.get('xpack.apm.serviceMapEnabled'), - apmTransactionIndices: config.get('apm_oss.transactionIndices') + apmServiceMapEnabled: config.get('xpack.apm.serviceMapEnabled') }; }, hacks: ['plugins/apm/hacks/toggle_app_link_in_nav'], diff --git a/x-pack/legacy/plugins/apm/mappings.json b/x-pack/legacy/plugins/apm/mappings.json index 26075d406c993..0b31798242fad 100644 --- a/x-pack/legacy/plugins/apm/mappings.json +++ b/x-pack/legacy/plugins/apm/mappings.json @@ -41,5 +41,30 @@ } } } + }, + "apm-indices": { + "properties": { + "apm_oss.sourcemapIndices": { + "type": "keyword" + }, + "apm_oss.errorIndices": { + "type": "keyword" + }, + "apm_oss.onboardingIndices": { + "type": "keyword" + }, + "apm_oss.spanIndices": { + "type": "keyword" + }, + "apm_oss.transactionIndices": { + "type": "keyword" + }, + "apm_oss.metricsIndices": { + "type": "keyword" + }, + "apm_oss.apmAgentConfigurationIndex": { + "type": "keyword" + } + } } } diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ErrorTabs.tsx b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ErrorTabs.tsx index 253580ce5cecd..33b20b0f0f226 100644 --- a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ErrorTabs.tsx +++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ErrorTabs.tsx @@ -17,7 +17,7 @@ export interface ErrorTab { export const logStacktraceTab: ErrorTab = { key: 'log_stacktrace', label: i18n.translate('xpack.apm.propertiesTable.tabs.logStacktraceLabel', { - defaultMessage: 'Log stacktrace' + defaultMessage: 'Log stack trace' }) }; @@ -26,7 +26,7 @@ export const exceptionStacktraceTab: ErrorTab = { label: i18n.translate( 'xpack.apm.propertiesTable.tabs.exceptionStacktraceLabel', { - defaultMessage: 'Exception stacktrace' + defaultMessage: 'Exception stack trace' } ) }; diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ExceptionStacktrace.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ExceptionStacktrace.test.tsx new file mode 100644 index 0000000000000..8ec9c604e7038 --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ExceptionStacktrace.test.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 React from 'react'; +import { shallow } from 'enzyme'; +import { ExceptionStacktrace } from './ExceptionStacktrace'; + +describe('ExceptionStacktrace', () => { + describe('render', () => { + it('renders', () => { + const props = { exceptions: [] }; + + expect(() => + shallow() + ).not.toThrowError(); + }); + + describe('with a stack trace', () => { + it('renders the stack trace', () => { + const props = { exceptions: [{}] }; + + expect( + shallow().find('Stacktrace') + ).toHaveLength(1); + }); + }); + + describe('with more than one stack trace', () => { + it('renders a cause stack trace', () => { + const props = { exceptions: [{}, {}] }; + + expect( + shallow().find('CauseStacktrace') + ).toHaveLength(1); + }); + }); + }); +}); diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ExceptionStacktrace.tsx b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ExceptionStacktrace.tsx new file mode 100644 index 0000000000000..13c904a119449 --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ExceptionStacktrace.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 React from 'react'; +import { EuiTitle } from '@elastic/eui'; +import { idx } from '@kbn/elastic-idx/target'; +import { Exception } from '../../../../../typings/es_schemas/raw/ErrorRaw'; +import { Stacktrace } from '../../../shared/Stacktrace'; +import { CauseStacktrace } from '../../../shared/Stacktrace/CauseStacktrace'; + +interface ExceptionStacktraceProps { + codeLanguage?: string; + exceptions: Exception[]; +} + +export function ExceptionStacktrace({ + codeLanguage, + exceptions +}: ExceptionStacktraceProps) { + const title = idx(exceptions, _ => _[0].message); + + return ( + <> + +

{title}

+ + {exceptions.map((ex, index) => { + return index === 0 ? ( + + ) : ( + + ); + })} + + ); +} diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/__snapshots__/index.test.tsx.snap index be9d67f31cb11..39874c11b09bf 100644 --- a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/__snapshots__/index.test.tsx.snap +++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/__snapshots__/index.test.tsx.snap @@ -46,7 +46,7 @@ exports[`DetailView should render TabContent 1`] = ` currentTab={ Object { "key": "exception_stacktrace", - "label": "Exception stacktrace", + "label": "Exception stack trace", } } error={ @@ -71,7 +71,7 @@ exports[`DetailView should render tabs 1`] = ` key="exception_stacktrace" onClick={[Function]} > - Exception stacktrace + Exception stack trace _.service.language.name); - const excStackframes = idx(error, _ => _.error.exception[0].stacktrace); + const exceptions = idx(error, _ => _.error.exception) || []; const logStackframes = idx(error, _ => _.error.log.stacktrace); switch (currentTab.key) { @@ -198,7 +199,10 @@ export function TabContent({ ); case exceptionStacktraceTab.key: return ( - + ); default: return ; diff --git a/x-pack/legacy/plugins/apm/public/components/app/Main/ProvideBreadcrumbs.tsx b/x-pack/legacy/plugins/apm/public/components/app/Main/ProvideBreadcrumbs.tsx index 0c1d20d65b7b9..cfbe8b1edbd71 100644 --- a/x-pack/legacy/plugins/apm/public/components/app/Main/ProvideBreadcrumbs.tsx +++ b/x-pack/legacy/plugins/apm/public/components/app/Main/ProvideBreadcrumbs.tsx @@ -12,11 +12,10 @@ import { RouteProps, withRouter } from 'react-router-dom'; -import { StringMap } from '../../../../typings/common'; import { RouteName } from './route_config/route_names'; type LocationMatch = Pick< - RouteComponentProps>, + RouteComponentProps>, 'location' | 'match' >; @@ -75,7 +74,7 @@ export function getBreadcrumb({ return null; } - const match = matchPath>(currentPath, route); + const match = matchPath>(currentPath, route); if (match) { return parse({ diff --git a/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/index.tsx index 6c95095592fe4..4769fe6400ac1 100644 --- a/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/index.tsx +++ b/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/index.tsx @@ -15,7 +15,9 @@ import { TransactionDetails } from '../../TransactionDetails'; import { Home } from '../../Home'; import { BreadcrumbRoute } from '../ProvideBreadcrumbs'; import { RouteName } from './route_names'; +import { Settings } from '../../Settings'; import { AgentConfigurations } from '../../Settings/AgentConfigurations'; +import { ApmIndices } from '../../Settings/ApmIndices'; import { toQuery } from '../../../shared/Links/url_helpers'; import { ServiceNodeMetrics } from '../../ServiceNodeMetrics'; import { resolveUrlParams } from '../../../../context/UrlParamsContext/resolveUrlParams'; @@ -69,12 +71,41 @@ export const routes: BreadcrumbRoute[] = [ { exact: true, path: '/settings', - component: AgentConfigurations, + render: renderAsRedirectTo('/settings/agent-configuration'), breadcrumb: i18n.translate('xpack.apm.breadcrumb.listSettingsTitle', { defaultMessage: 'Settings' }), name: RouteName.SETTINGS }, + { + exact: true, + path: '/settings/apm-indices', + component: () => ( + + + + ), + breadcrumb: i18n.translate('xpack.apm.breadcrumb.settings.indicesTitle', { + defaultMessage: 'Indices' + }), + name: RouteName.INDICES + }, + { + exact: true, + path: '/settings/agent-configuration', + component: () => ( + + + + ), + breadcrumb: i18n.translate( + 'xpack.apm.breadcrumb.settings.agentConfigurationTitle', + { + defaultMessage: 'Agent Configuration' + } + ), + name: RouteName.AGENT_CONFIGURATION + }, { exact: true, path: '/services/:serviceName', diff --git a/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/route_names.tsx b/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/route_names.tsx index 3af5b217ca738..ab02e38ee9c9d 100644 --- a/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/route_names.tsx +++ b/x-pack/legacy/plugins/apm/public/components/app/Main/route_config/route_names.tsx @@ -19,5 +19,7 @@ export enum RouteName { TRANSACTION_TYPE = 'transaction_type', TRANSACTION_NAME = 'transaction_name', SETTINGS = 'settings', + AGENT_CONFIGURATION = 'agent_configuration', + INDICES = 'indices', SERVICE_NODES = 'nodes' } diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/createErrorGroupWatch.test.ts b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/createErrorGroupWatch.test.ts index 4d6c3f4c116c9..c7860b81a7b1e 100644 --- a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/createErrorGroupWatch.test.ts +++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/createErrorGroupWatch.test.ts @@ -7,7 +7,6 @@ import { isArray, isObject, isString } from 'lodash'; import mustache from 'mustache'; import uuid from 'uuid'; -import { StringMap } from '../../../../../../typings/common'; // @ts-ignore import * as rest from '../../../../../services/rest/watcher'; import { createErrorGroupWatch } from '../createErrorGroupWatch'; @@ -85,8 +84,11 @@ describe('createErrorGroupWatch', () => { }); // Recursively iterate a nested structure and render strings as mustache templates -type InputOutput = string | string[] | StringMap; -function renderMustache(input: InputOutput, ctx: StringMap): InputOutput { +type InputOutput = string | string[] | Record; +function renderMustache( + input: InputOutput, + ctx: Record +): InputOutput { if (isString(input)) { return mustache.render(input, { ctx, diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/createErrorGroupWatch.ts b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/createErrorGroupWatch.ts index 2617fef6de1d2..e7d06403b8f8e 100644 --- a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/createErrorGroupWatch.ts +++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/createErrorGroupWatch.ts @@ -17,7 +17,6 @@ import { PROCESSOR_EVENT, SERVICE_NAME } from '../../../../../common/elasticsearch_fieldnames'; -import { StringMap } from '../../../../../typings/common'; // @ts-ignore import { createWatch } from '../../../../services/rest/watcher'; @@ -50,8 +49,8 @@ interface Arguments { interface Actions { log_error: { logging: { text: string } }; - slack_webhook?: StringMap; - email?: StringMap; + slack_webhook?: Record; + email?: Record; } export async function createErrorGroupWatch({ diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceNodeMetrics/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceNodeMetrics/index.tsx index 2833b0476428c..79874d6648d0f 100644 --- a/x-pack/legacy/plugins/apm/public/components/app/ServiceNodeMetrics/index.tsx +++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceNodeMetrics/index.tsx @@ -113,7 +113,7 @@ export function ServiceNodeMetrics() { ) }} - > + /> ) : ( @@ -129,7 +129,7 @@ export function ServiceNodeMetrics() { {host} } - > + /> {containerId} } - > + /> )} diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx index e2630efbcf500..9e95cfd0fad7f 100644 --- a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx +++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx @@ -10,7 +10,6 @@ import { EuiTitle, EuiFlexGroup, EuiFlexItem, - EuiButtonEmpty, EuiPanel, EuiSpacer, EuiButton @@ -18,7 +17,6 @@ import { import { isEmpty } from 'lodash'; import { useFetcher } from '../../../../hooks/useFetcher'; import { AgentConfigurationListAPIResponse } from '../../../../../server/lib/settings/agent_configuration/list_configurations'; -import { HomeLink } from '../../../shared/Links/apm/HomeLink'; import { AgentConfigurationList } from './AgentConfigurationList'; import { useTrackPageview } from '../../../../../../infra/public'; import { AddEditFlyout } from './AddEditFlyout'; @@ -62,30 +60,6 @@ export function AgentConfigurations() { /> )} - - - -

- {i18n.translate('xpack.apm.settings.agentConf.pageTitle', { - defaultMessage: 'Settings' - })} -

- - - - - - {i18n.translate( - 'xpack.apm.settings.agentConf.returnToOverviewLinkLabel', - { defaultMessage: 'Return to overview' } - )} - - - - - - - diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx new file mode 100644 index 0000000000000..67957ae76b1f1 --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx @@ -0,0 +1,258 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * 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, { useState, useEffect } from 'react'; +import { i18n } from '@kbn/i18n'; +import { + EuiTitle, + EuiFlexGroup, + EuiFlexItem, + EuiPanel, + EuiSpacer, + EuiText, + EuiForm, + EuiFormRow, + EuiFieldText, + EuiButton, + EuiButtonEmpty +} from '@elastic/eui'; +import { useFetcher } from '../../../../hooks/useFetcher'; +import { useCallApmApi } from '../../../../hooks/useCallApmApi'; +import { APMClient } from '../../../../services/rest/createCallApmApi'; +import { useKibanaCore } from '../../../../../../observability/public'; + +const APM_INDEX_LABELS = [ + { + configurationName: 'apm_oss.sourcemapIndices', + label: i18n.translate( + 'xpack.apm.settings.apmIndices.sourcemapIndicesLabel', + { defaultMessage: 'Sourcemap Indices' } + ) + }, + { + configurationName: 'apm_oss.errorIndices', + label: i18n.translate('xpack.apm.settings.apmIndices.errorIndicesLabel', { + defaultMessage: 'Error Indices' + }) + }, + { + configurationName: 'apm_oss.onboardingIndices', + label: i18n.translate( + 'xpack.apm.settings.apmIndices.onboardingIndicesLabel', + { defaultMessage: 'Onboarding Indices' } + ) + }, + { + configurationName: 'apm_oss.spanIndices', + label: i18n.translate('xpack.apm.settings.apmIndices.spanIndicesLabel', { + defaultMessage: 'Span Indices' + }) + }, + { + configurationName: 'apm_oss.transactionIndices', + label: i18n.translate( + 'xpack.apm.settings.apmIndices.transactionIndicesLabel', + { defaultMessage: 'Transaction Indices' } + ) + }, + { + configurationName: 'apm_oss.metricsIndices', + label: i18n.translate('xpack.apm.settings.apmIndices.metricsIndicesLabel', { + defaultMessage: 'Metrics Indices' + }) + }, + { + configurationName: 'apm_oss.apmAgentConfigurationIndex', + label: i18n.translate( + 'xpack.apm.settings.apmIndices.apmAgentConfigurationIndexLabel', + { defaultMessage: 'Agent Configuration Index' } + ) + } +]; + +async function saveApmIndices({ + callApmApi, + apmIndices +}: { + callApmApi: APMClient; + apmIndices: Record; +}) { + await callApmApi({ + method: 'POST', + pathname: '/api/apm/settings/apm-indices/save', + params: { + body: apmIndices + } + }); +} + +export function ApmIndices() { + const { + notifications: { toasts } + } = useKibanaCore(); + + const [apmIndices, setApmIndices] = useState>({}); + const [isSaving, setIsSaving] = useState(false); + + const callApmApiFromHook = useCallApmApi(); + + const { data = [], status, refetch } = useFetcher( + callApmApi => + callApmApi({ pathname: `/api/apm/settings/apm-index-settings` }), + [] + ); + + useEffect(() => { + setApmIndices( + data.reduce( + (acc, { configurationName, savedValue }) => ({ + ...acc, + [configurationName]: savedValue + }), + {} + ) + ); + }, [data]); + + const handleApplyChangesEvent = async ( + event: + | React.FormEvent + | React.MouseEvent + ) => { + event.preventDefault(); + setIsSaving(true); + try { + await saveApmIndices({ + callApmApi: callApmApiFromHook, + apmIndices + }); + toasts.addSuccess({ + title: i18n.translate( + 'xpack.apm.settings.apmIndices.applyChanges.succeeded.title', + { defaultMessage: 'Indices applied' } + ), + text: i18n.translate( + 'xpack.apm.settings.apmIndices.applyChanges.succeeded.text', + { + defaultMessage: + 'The indices changes were successfully applied. These changes are reflected immediately in the APM UI' + } + ) + }); + } catch (error) { + toasts.addDanger({ + title: i18n.translate( + 'xpack.apm.settings.apmIndices.applyChanges.failed.title', + { defaultMessage: 'Indices could not be applied.' } + ), + text: i18n.translate( + 'xpack.apm.settings.apmIndices.applyChanges.failed.text', + { + defaultMessage: + 'Something went wrong when applying indices. Error: {errorMessage}', + values: { errorMessage: error.message } + } + ) + }); + } + setIsSaving(false); + }; + + const handleChangeIndexConfigurationEvent = async ( + event: React.ChangeEvent + ) => { + const { name, value } = event.target; + setApmIndices({ + ...apmIndices, + [name]: value + }); + }; + + return ( + + + + +

+ {i18n.translate('xpack.apm.settings.apmIndices.title', { + defaultMessage: 'Indices' + })} +

+ + + +

+ {i18n.translate('xpack.apm.settings.apmIndices.description', { + defaultMessage: `The APM UI uses index patterns to query your APM indices. If you've customized the index names that APM Server writes events to, you may need to update these patterns for the APM UI to work. Settings here take precedence over those set in kibana.yml.` + })} +

+ + {APM_INDEX_LABELS.map(({ configurationName, label }) => { + const matchedConfiguration = data.find( + ({ configurationName: configName }) => + configName === configurationName + ); + const defaultValue = matchedConfiguration + ? matchedConfiguration.defaultValue + : ''; + const savedUiIndexValue = apmIndices[configurationName] || ''; + return ( + + + + ); + })} + + + + + {i18n.translate( + 'xpack.apm.settings.apmIndices.cancelButton', + { defaultMessage: 'Cancel' } + )} + + + + + {i18n.translate( + 'xpack.apm.settings.apmIndices.applyButton', + { defaultMessage: 'Apply changes' } + )} + + + + + + + + + + + ); +} diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/index.tsx new file mode 100644 index 0000000000000..f3be5abe4d48b --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/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'; +import { i18n } from '@kbn/i18n'; +import { + EuiButtonEmpty, + EuiPage, + EuiSideNav, + EuiPageSideBar, + EuiPageBody +} from '@elastic/eui'; +import { HomeLink } from '../../shared/Links/apm/HomeLink'; +import { useLocation } from '../../../hooks/useLocation'; +import { getAPMHref } from '../../shared/Links/apm/APMLink'; + +export const Settings: React.FC = props => { + const { search, pathname } = useLocation(); + return ( + <> + + + {i18n.translate('xpack.apm.settings.returnToOverviewLinkLabel', { + defaultMessage: 'Return to overview' + })} + + + + + + + {props.children} + + + ); +}; diff --git a/x-pack/legacy/plugins/apm/public/components/app/TraceOverview/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TraceOverview/index.tsx index 4f14c4ba85932..1ecf72f6fa3fc 100644 --- a/x-pack/legacy/plugins/apm/public/components/app/TraceOverview/index.tsx +++ b/x-pack/legacy/plugins/apm/public/components/app/TraceOverview/index.tsx @@ -49,7 +49,7 @@ export function TraceOverview() { return ( - + diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/TruncateHeightSection.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/TruncateHeightSection.tsx index 18e29c92d2e68..b01dc2c5398e2 100644 --- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/TruncateHeightSection.tsx +++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/TruncateHeightSection.tsx @@ -4,12 +4,11 @@ * you may not use this file except in compliance with the Elastic License. */ -import { EuiLink } from '@elastic/eui'; +import { EuiIcon, EuiLink } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import React, { Fragment, useEffect, useRef, useState } from 'react'; import styled from 'styled-components'; import { px, units } from '../../../../../../../style/variables'; -import { Ellipsis } from '../../../../../../shared/Icons'; const ToggleButtonContainer = styled.div` margin-top: ${px(units.half)}; @@ -55,7 +54,13 @@ export const TruncateHeightSection: React.SFC = ({ setIsOpen(!isOpen); }} > - {' '} + {' '} {isOpen ? i18n.translate('xpack.apm.toggleHeight.showLessButtonLabel', { defaultMessage: 'Show fewer lines' diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/index.tsx index 7e9171197251d..0f5893772fec8 100644 --- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/index.tsx +++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/index.tsx @@ -224,6 +224,7 @@ export function SpanFlyout({ ), content: ( + ) diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx index db3e43574023c..2020b8252035b 100644 --- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx +++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx @@ -11,7 +11,8 @@ import { EuiFlyoutHeader, EuiPortal, EuiSpacer, - EuiTitle + EuiTitle, + EuiHorizontalRule } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import React from 'react'; @@ -40,7 +41,6 @@ function TransactionPropertiesTable({

Metadata

 -
); @@ -87,7 +87,7 @@ export function TransactionFlyout({ totalDuration={traceRootDuration} errorCount={errorCount} /> - + diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts index cc7697c1d8964..10f59e237ba7f 100644 --- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts +++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts @@ -17,7 +17,6 @@ import { } from 'lodash'; import { idx } from '@kbn/elastic-idx'; import { TraceAPIResponse } from '../../../../../../../../server/lib/traces/get_trace'; -import { StringMap } from '../../../../../../../../typings/common'; import { Span } from '../../../../../../../../typings/es_schemas/ui/Span'; import { Transaction } from '../../../../../../../../typings/es_schemas/ui/Transaction'; @@ -191,7 +190,7 @@ function getServices(items: IWaterfallItem[]) { return uniq(serviceNames); } -export type IServiceColors = StringMap; +export type IServiceColors = Record; function getServiceColors(services: string[]) { const assignedColors = [ diff --git a/x-pack/legacy/plugins/apm/public/components/shared/DottedKeyValueTable/__test__/DottedKeyValueTable.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/DottedKeyValueTable/__test__/DottedKeyValueTable.test.tsx deleted file mode 100644 index aebc86352a774..0000000000000 --- a/x-pack/legacy/plugins/apm/public/components/shared/DottedKeyValueTable/__test__/DottedKeyValueTable.test.tsx +++ /dev/null @@ -1,134 +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 { DottedKeyValueTable } from '..'; -import { cleanup, render } from 'react-testing-library'; - -function getKeys(output: ReturnType) { - const keys = output.getAllByTestId('dot-key'); - return Array.isArray(keys) ? keys.map(node => node.textContent) : []; -} - -function getValues(output: ReturnType) { - const values = output.getAllByTestId('value'); - return Array.isArray(values) ? values.map(node => node.textContent) : []; -} - -describe('DottedKeyValueTable', () => { - afterEach(cleanup); - - it('should display a nested object with alpha-ordered, dot notation keys and values', () => { - const data = { - name: { - first: 'Jo', - last: 'Smith' - }, - age: 29, - active: true, - useless: false, - start: null, - end: undefined, - nested: { - b: { - c: 'ccc' - }, - a: 'aaa' - } - }; - const output = render(); - const rows = output.container.querySelectorAll('tr'); - expect(rows.length).toEqual(9); - - expect(getKeys(output)).toEqual([ - 'active', - 'age', - 'end', - 'name.first', - 'name.last', - 'nested.a', - 'nested.b.c', - 'start', - 'useless' - ]); - - expect(getValues(output)).toEqual([ - 'true', - '29', - 'N/A', - 'Jo', - 'Smith', - 'aaa', - 'ccc', - 'N/A', - 'false' - ]); - }); - - it('should respect max depth', () => { - const data = { - nested: { b: { c: 'ccc' }, a: 'aaa' } - }; - const output = render(); - const rows = output.container.querySelectorAll('tr'); - expect(rows.length).toEqual(2); - - expect(getKeys(output)).toEqual(['nested.a', 'nested.b']); - - expect(getValues(output)).toEqual([ - 'aaa', - JSON.stringify({ c: 'ccc' }, null, 4) - ]); - }); - - it('should prepend a provided parent key to all of the dot-notation keys', () => { - const data = { - name: { - first: 'Jo', - last: 'Smith' - }, - age: 29, - active: true - }; - const output = render(); - const rows = output.container.querySelectorAll('tr'); - expect(rows.length).toEqual(4); - - expect(getKeys(output)).toEqual([ - 'top.active', - 'top.age', - 'top.name.first', - 'top.name.last' - ]); - }); - - it('should not add 0 sufix if value is an array with one element', () => { - const data = { - a: { - b: { - c1: ['foo', 'bar'], - c2: ['foo'] - } - }, - b: { - c: ['foo'] - }, - c: { - d: ['foo', 'bar'] - } - }; - const output = render(); - - expect(getKeys(output)).toEqual([ - 'a.b.c1.0', - 'a.b.c1.1', - 'a.b.c2', - 'b.c', - 'c.d.0', - 'c.d.1' - ]); - }); -}); diff --git a/x-pack/legacy/plugins/apm/public/components/shared/DottedKeyValueTable/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/DottedKeyValueTable/index.tsx deleted file mode 100644 index 674df14c62eb0..0000000000000 --- a/x-pack/legacy/plugins/apm/public/components/shared/DottedKeyValueTable/index.tsx +++ /dev/null @@ -1,89 +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, { TableHTMLAttributes } from 'react'; -import { compact, isObject } from 'lodash'; -import { - EuiTable, - EuiTableProps, - EuiTableBody, - EuiTableRow, - EuiTableRowCell -} from '@elastic/eui'; -import { StringMap } from '../../../../typings/common'; -import { FormattedValue } from './FormattedValue'; - -interface PathifyOptions { - maxDepth?: number; - parentKey?: string; - depth?: number; -} - -interface PathifyResult { - [key: string]: any; -} - -/** - * Converts a deeply-nested object into a one-level object - * with dot-notation paths as keys. - */ -export function pathify( - item: StringMap, - { maxDepth, parentKey = '', depth = 0 }: PathifyOptions -): PathifyResult { - const isArrayWithSingleValue = Array.isArray(item) && item.length === 1; - return Object.keys(item) - .sort() - .reduce((pathified, key) => { - const childKey = isArrayWithSingleValue ? '' : key; - const currentKey = compact([parentKey, childKey]).join('.'); - if ((!maxDepth || depth + 1 <= maxDepth) && isObject(item[key])) { - return { - ...pathified, - ...pathify(item[key], { - maxDepth, - parentKey: currentKey, - depth: depth + 1 - }) - }; - } else { - return { ...pathified, [currentKey]: item[key] }; - } - }, {}); -} - -export function DottedKeyValueTable({ - data, - parentKey, - maxDepth, - tableProps = {} -}: { - data: StringMap; - parentKey?: string; - maxDepth?: number; - tableProps?: EuiTableProps & TableHTMLAttributes; -}) { - const pathified = pathify(data, { maxDepth, parentKey }); - const rows = Object.keys(pathified) - .sort() - .map(k => [k, pathified[k]]); - return ( - - - {rows.map(([key, value]) => ( - - - {key} - - - - - - ))} - - - ); -} diff --git a/x-pack/legacy/plugins/apm/public/components/shared/HeightRetainer/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/HeightRetainer/index.tsx new file mode 100644 index 0000000000000..e6f4487312429 --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/components/shared/HeightRetainer/index.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 React, { useEffect, useRef } from 'react'; + +export const HeightRetainer: React.SFC = props => { + const containerElement = useRef(null); + const minHeight = useRef(0); + + useEffect(() => { + if (containerElement.current) { + const currentHeight = containerElement.current.clientHeight; + if (minHeight.current < currentHeight) { + minHeight.current = currentHeight; + } + } + }); + + return ( +
+ ); +}; diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Icons.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Icons.tsx deleted file mode 100644 index 79b34b2818aac..0000000000000 --- a/x-pack/legacy/plugins/apm/public/components/shared/Icons.tsx +++ /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 { EuiIcon } from '@elastic/eui'; -import React from 'react'; - -export function Ellipsis({ horizontal }: { horizontal: boolean }) { - return ( - - ); -} diff --git a/x-pack/legacy/plugins/apm/public/components/shared/ImpactBar/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/ImpactBar/index.tsx index 7f9d3c9f9f3b3..ed931191cfb96 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/ImpactBar/index.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/ImpactBar/index.tsx @@ -6,10 +6,9 @@ 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 { +export interface ImpactBarProps extends Record { value: number; max?: number; } diff --git a/x-pack/legacy/plugins/apm/public/components/shared/DottedKeyValueTable/FormattedValue.tsx b/x-pack/legacy/plugins/apm/public/components/shared/KeyValueTable/FormattedValue.tsx similarity index 100% rename from x-pack/legacy/plugins/apm/public/components/shared/DottedKeyValueTable/FormattedValue.tsx rename to x-pack/legacy/plugins/apm/public/components/shared/KeyValueTable/FormattedValue.tsx diff --git a/x-pack/legacy/plugins/apm/public/components/shared/KeyValueTable/__test__/KeyValueTable.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/KeyValueTable/__test__/KeyValueTable.test.tsx new file mode 100644 index 0000000000000..2ce8feb08d4ad --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/components/shared/KeyValueTable/__test__/KeyValueTable.test.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 { KeyValueTable } from '..'; +import { cleanup, render } from 'react-testing-library'; + +function getKeys(output: ReturnType) { + const keys = output.getAllByTestId('dot-key'); + return Array.isArray(keys) ? keys.map(node => node.textContent) : []; +} + +function getValues(output: ReturnType) { + const values = output.getAllByTestId('value'); + return Array.isArray(values) ? values.map(node => node.textContent) : []; +} + +describe('KeyValueTable', () => { + afterEach(cleanup); + + it('displays key and value table', () => { + const data = [ + { key: 'name.first', value: 'First Name' }, + { key: 'name.last', value: 'Last Name' }, + { key: 'age', value: '29' }, + { key: 'active', value: true }, + { key: 'useless', value: false }, + { key: 'start', value: null }, + { key: 'end', value: undefined }, + { key: 'nested.b.c', value: 'ccc' }, + { key: 'nested.a', value: 'aaa' } + ]; + const output = render(); + const rows = output.container.querySelectorAll('tr'); + expect(rows.length).toEqual(9); + + expect(getKeys(output)).toEqual([ + 'name.first', + 'name.last', + 'age', + 'active', + 'useless', + 'start', + 'end', + 'nested.b.c', + 'nested.a' + ]); + + expect(getValues(output)).toEqual([ + 'First Name', + 'Last Name', + '29', + 'true', + 'false', + 'N/A', + 'N/A', + 'ccc', + 'aaa' + ]); + }); +}); diff --git a/x-pack/legacy/plugins/apm/public/components/shared/KeyValueTable/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/KeyValueTable/index.tsx new file mode 100644 index 0000000000000..b58f142f1abaa --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/components/shared/KeyValueTable/index.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 React, { TableHTMLAttributes } from 'react'; +import { + EuiTable, + EuiTableProps, + EuiTableBody, + EuiTableRow, + EuiTableRowCell +} from '@elastic/eui'; +import { FormattedValue } from './FormattedValue'; +import { KeyValuePair } from '../../../utils/flattenObject'; + +export function KeyValueTable({ + keyValuePairs, + tableProps = {} +}: { + keyValuePairs: KeyValuePair[]; + tableProps?: EuiTableProps & TableHTMLAttributes; +}) { + return ( + + + {keyValuePairs.map(({ key, value }) => ( + + + {key} + + + + + + ))} + + + ); +} diff --git a/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/Typeahead/index.js b/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/Typeahead/index.js index fc08dee8b93cb..7a7dfe8b50e3e 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/Typeahead/index.js +++ b/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/Typeahead/index.js @@ -9,7 +9,6 @@ import PropTypes from 'prop-types'; import Suggestions from './Suggestions'; import ClickOutside from './ClickOutside'; import { EuiFieldSearch, EuiProgress } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; const KEY_CODES = { LEFT: 37, @@ -157,7 +156,7 @@ export class Typeahead extends Component { }; render() { - const { queryExample } = this.props; + const { placeholder } = this.props; return ( { if (node) { this.inputRef = node; @@ -227,7 +217,7 @@ Typeahead.propTypes = { onChange: PropTypes.func.isRequired, onSubmit: PropTypes.func.isRequired, suggestions: PropTypes.array.isRequired, - queryExample: PropTypes.string.isRequired + placeholder: PropTypes.string.isRequired }; Typeahead.defaultProps = { diff --git a/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/get_bool_filter.js b/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/get_bool_filter.ts similarity index 64% rename from x-pack/legacy/plugins/apm/public/components/shared/KueryBar/get_bool_filter.js rename to x-pack/legacy/plugins/apm/public/components/shared/KueryBar/get_bool_filter.ts index 48a94a96acd3c..f4628524cced5 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/get_bool_filter.js +++ b/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/get_bool_filter.ts @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ +import { ESFilter } from '../../../../typings/elasticsearch'; import { TRANSACTION_TYPE, ERROR_GROUP_ID, @@ -11,27 +12,34 @@ import { TRANSACTION_NAME, SERVICE_NAME } from '../../../../common/elasticsearch_fieldnames'; +import { IUrlParams } from '../../../context/UrlParamsContext/types'; -export function getBoolFilter(urlParams) { - const boolFilter = [ +export function getBoolFilter(urlParams: IUrlParams) { + const { start, end, serviceName, processorEvent } = urlParams; + + if (!start || !end) { + throw new Error('Date range was not defined'); + } + + const boolFilter: ESFilter[] = [ { range: { '@timestamp': { - gte: new Date(urlParams.start).getTime(), - lte: new Date(urlParams.end).getTime(), + gte: new Date(start).getTime(), + lte: new Date(end).getTime(), format: 'epoch_millis' } } } ]; - if (urlParams.serviceName) { + if (serviceName) { boolFilter.push({ - term: { [SERVICE_NAME]: urlParams.serviceName } + term: { [SERVICE_NAME]: serviceName } }); } - switch (urlParams.processorEvent) { + switch (processorEvent) { case 'transaction': boolFilter.push({ term: { [PROCESSOR_EVENT]: 'transaction' } @@ -62,12 +70,19 @@ export function getBoolFilter(urlParams) { } break; + case 'metric': + boolFilter.push({ + term: { [PROCESSOR_EVENT]: 'metric' } + }); + break; + default: boolFilter.push({ bool: { should: [ { term: { [PROCESSOR_EVENT]: 'error' } }, - { term: { [PROCESSOR_EVENT]: 'transaction' } } + { term: { [PROCESSOR_EVENT]: 'transaction' } }, + { term: { [PROCESSOR_EVENT]: 'metric' } } ] } }); diff --git a/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/index.tsx index 0e95bb94ea911..7c0b6f24f87a7 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/index.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/index.tsx @@ -6,29 +6,20 @@ import React, { useState } from 'react'; import { uniqueId, startsWith } from 'lodash'; -import { EuiCallOut } from '@elastic/eui'; import styled from 'styled-components'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { i18n } from '@kbn/i18n'; import { npStart } from 'ui/new_platform'; -import { StaticIndexPattern, getFromSavedObject } from 'ui/index_patterns'; +import { StaticIndexPattern } from 'ui/index_patterns'; import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query'; +import { i18n } from '@kbn/i18n'; import { fromQuery, toQuery } from '../Links/url_helpers'; -import { KibanaLink } from '../Links/KibanaLink'; // @ts-ignore import { Typeahead } from './Typeahead'; -// @ts-ignore import { getBoolFilter } from './get_bool_filter'; import { useLocation } from '../../../hooks/useLocation'; import { useUrlParams } from '../../../hooks/useUrlParams'; import { history } from '../../../utils/history'; -import { useMatchedRoutes } from '../../../hooks/useMatchedRoutes'; -import { RouteName } from '../../app/Main/route_config/route_names'; -import { useKibanaCore } from '../../../../../observability/public'; -import { ISavedObject } from '../../../services/rest/savedObjects'; import { AutocompleteSuggestion } from '../../../../../../../../src/plugins/data/public'; -import { FETCH_STATUS } from '../../../hooks/useFetcher'; -import { useAPMIndexPattern } from '../../../hooks/useAPMIndexPattern'; +import { useKueryBarIndexPattern } from '../../../hooks/useKueryBarIndexPattern'; const Container = styled.div` margin-bottom: 10px; @@ -50,16 +41,10 @@ function convertKueryToEsQuery( return toElasticsearchQuery(ast, indexPattern); } -function getAPMIndexPatternForKuery( - apmIndexPattern: ISavedObject -): StaticIndexPattern | undefined { - return getFromSavedObject(apmIndexPattern); -} - function getSuggestions( query: string, selectionStart: number, - apmIndexPattern: StaticIndexPattern, + indexPattern: StaticIndexPattern, boolFilter: unknown ) { const autocompleteProvider = getAutocompleteProvider('kuery'); @@ -72,7 +57,7 @@ function getSuggestions( const getAutocompleteSuggestions = autocompleteProvider({ config, - indexPatterns: [apmIndexPattern], + indexPatterns: [indexPattern], boolFilter }); return getAutocompleteSuggestions({ @@ -83,43 +68,28 @@ function getSuggestions( } export function KueryBar() { - const core = useKibanaCore(); const [state, setState] = useState({ suggestions: [], isLoadingSuggestions: false }); const { urlParams } = useUrlParams(); const location = useLocation(); - const matchedRoutes = useMatchedRoutes(); - - const apmIndexPatternTitle = core.injectedMetadata.getInjectedVar( - 'apmIndexPatternTitle' - ); - - const { - apmIndexPattern, - status: apmIndexPatternStatus - } = useAPMIndexPattern(); - - const indexPattern = - apmIndexPatternStatus === FETCH_STATUS.SUCCESS - ? getAPMIndexPatternForKuery(apmIndexPattern) - : null; - - const indexPatternMissing = status === FETCH_STATUS.SUCCESS && !indexPattern; let currentRequestCheck; - const exampleMap: { [key: string]: string } = { - [RouteName.TRANSACTIONS]: 'transaction.duration.us > 300000', - [RouteName.ERRORS]: 'http.response.status_code >= 400', - [RouteName.METRICS]: 'process.pid = "1234"' + const { processorEvent } = urlParams; + + const examples = { + transaction: 'transaction.duration.us > 300000', + error: 'http.response.status_code >= 400', + metric: 'process.pid = "1234"', + defaults: + 'transaction.duration.us > 300000 AND http.response.status_code >= 400' }; - // sets queryExample to the first matched example query, else default example - const queryExample = - matchedRoutes.map(({ name }) => exampleMap[name]).find(Boolean) || - 'transaction.duration.us > 300000 AND http.response.status_code >= 400'; + const example = examples[processorEvent || 'defaults']; + + const { indexPattern } = useKueryBarIndexPattern(processorEvent); async function onChange(inputValue: string, selectionStart: number) { if (indexPattern == null) { @@ -179,42 +149,24 @@ export function KueryBar() { return ( - - {indexPatternMissing && ( - - - {i18n.translate( - 'xpack.apm.kueryBar.setupInstructionsLinkLabel', - { defaultMessage: 'Setup Instructions' } - )} - - ) - }} - /> -
+ placeholder={i18n.translate('xpack.apm.kueryBar.placeholder', { + defaultMessage: `Search {event, select, + transaction {transactions} + metric {metrics} + error {errors} + other {transactions, errors and metrics} + } (E.g. {queryExample})`, + values: { + queryExample: example, + event: processorEvent } - color="warning" - iconType="alert" - size="s" - /> - )} + })} + /> ); } diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/url_helpers.ts b/x-pack/legacy/plugins/apm/public/components/shared/Links/url_helpers.ts index 763ee93df6415..357ea23d522a0 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/Links/url_helpers.ts +++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/url_helpers.ts @@ -6,13 +6,12 @@ import qs from 'querystring'; import { LocalUIFilterName } from '../../../../server/lib/ui_filters/local_ui_filters/config'; -import { StringMap } from '../../../../typings/common'; export function toQuery(search?: string): APMQueryParamsRaw { return search ? qs.parse(search.slice(1)) : {}; } -export function fromQuery(query: StringMap) { +export function fromQuery(query: Record) { return qs.stringify(query, undefined, undefined, { encodeURIComponent: (value: string) => { return encodeURIComponent(value).replace(/%3A/g, ':'); @@ -39,6 +38,7 @@ export type APMQueryParams = { rangeTo?: string; refreshPaused?: string | boolean; refreshInterval?: string | number; + searchTerm?: string; } & { [key in LocalUIFilterName]?: string }; // forces every value of T[K] to be type: string diff --git a/x-pack/legacy/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterBadgeList.tsx b/x-pack/legacy/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterBadgeList.tsx index a1140dcbbb3fc..01d2d56b6d142 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterBadgeList.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterBadgeList.tsx @@ -32,7 +32,7 @@ const FilterBadgeList = ({ onRemove, value }: Props) => ( > {val} - + diff --git a/x-pack/legacy/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx index aef8e5747d992..412b92d525aa2 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx @@ -168,7 +168,7 @@ const Filter = ({ }} value={value} /> - + ) : null} diff --git a/x-pack/legacy/plugins/apm/public/components/shared/ManagedTable/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/ManagedTable/index.tsx index 0f5fcceea3d20..29a8528295dd7 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/ManagedTable/index.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/ManagedTable/index.tsx @@ -8,7 +8,6 @@ import { EuiBasicTable } from '@elastic/eui'; import { sortByOrder } from 'lodash'; import React, { useMemo, useCallback, ReactNode } from 'react'; import { idx } from '@kbn/elastic-idx'; -import { StringMap } from '../../../../typings/common'; import { useUrlParams } from '../../../hooks/useUrlParams'; import { history } from '../../../utils/history'; import { fromQuery, toQuery } from '../Links/url_helpers'; @@ -16,7 +15,7 @@ import { fromQuery, toQuery } from '../Links/url_helpers'; // TODO: this should really be imported from EUI export interface ITableColumn { name: ReactNode; - actions?: StringMap[]; + actions?: Array>; field?: string; dataType?: string; align?: string; diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/ErrorMetadata/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/ErrorMetadata/index.tsx index 652bb25afed8e..04a5b60467730 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/ErrorMetadata/index.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/ErrorMetadata/index.tsx @@ -4,9 +4,10 @@ * you may not use this file except in compliance with the Elastic License. */ -import React from 'react'; +import React, { useMemo } from 'react'; import { ERROR_METADATA_SECTIONS } from './sections'; import { APMError } from '../../../../../typings/es_schemas/ui/APMError'; +import { getSectionsWithRows } from '../helper'; import { MetadataTable } from '..'; interface Props { @@ -14,5 +15,9 @@ interface Props { } export function ErrorMetadata({ error }: Props) { - return ; + const sectionsWithRows = useMemo( + () => getSectionsWithRows(ERROR_METADATA_SECTIONS, error), + [error] + ); + return ; } diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/Section.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/Section.tsx new file mode 100644 index 0000000000000..6f67b2458ea10 --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/Section.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 React from 'react'; +import { i18n } from '@kbn/i18n'; +import { EuiText } from '@elastic/eui'; +import { KeyValueTable } from '../KeyValueTable'; +import { KeyValuePair } from '../../../utils/flattenObject'; + +interface Props { + keyValuePairs?: KeyValuePair[]; +} + +export function Section({ keyValuePairs }: Props) { + if (keyValuePairs) { + return ; + } + return ( + + {i18n.translate( + 'xpack.apm.propertiesTable.agentFeature.noDataAvailableLabel', + { defaultMessage: 'No data available' } + )} + + ); +} diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/index.tsx index 713863639d1b7..03182062d324a 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/index.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/index.tsx @@ -4,9 +4,10 @@ * you may not use this file except in compliance with the Elastic License. */ -import React from 'react'; +import React, { useMemo } from 'react'; import { SPAN_METADATA_SECTIONS } from './sections'; import { Span } from '../../../../../typings/es_schemas/ui/Span'; +import { getSectionsWithRows } from '../helper'; import { MetadataTable } from '..'; interface Props { @@ -14,5 +15,9 @@ interface Props { } export function SpanMetadata({ span }: Props) { - return ; + const sectionsWithRows = useMemo( + () => getSectionsWithRows(SPAN_METADATA_SECTIONS, span), + [span] + ); + return ; } diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/index.tsx index fa2b32b403ee7..4216e37e0cb27 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/index.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/index.tsx @@ -4,9 +4,10 @@ * you may not use this file except in compliance with the Elastic License. */ -import React from 'react'; +import React, { useMemo } from 'react'; import { TRANSACTION_METADATA_SECTIONS } from './sections'; import { Transaction } from '../../../../../typings/es_schemas/ui/Transaction'; +import { getSectionsWithRows } from '../helper'; import { MetadataTable } from '..'; interface Props { @@ -14,10 +15,9 @@ interface Props { } export function TransactionMetadata({ transaction }: Props) { - return ( - + const sectionsWithRows = useMemo( + () => getSectionsWithRows(TRANSACTION_METADATA_SECTIONS, transaction), + [transaction] ); + return ; } diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/MetadataTable.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/MetadataTable.test.tsx index 331a8bf41642e..bdf895f423913 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/MetadataTable.test.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/MetadataTable.test.tsx @@ -8,77 +8,44 @@ import React from 'react'; import 'jest-dom/extend-expect'; import { render, cleanup } from 'react-testing-library'; import { MetadataTable } from '..'; -import { - expectTextsInDocument, - expectTextsNotInDocument -} from '../../../../utils/testHelpers'; -import { Transaction } from '../../../../../typings/es_schemas/ui/Transaction'; +import { expectTextsInDocument } from '../../../../utils/testHelpers'; +import { SectionsWithRows } from '../helper'; describe('MetadataTable', () => { afterEach(cleanup); + it('shows sections', () => { + const sectionsWithRows = ([ + { key: 'foo', label: 'Foo', required: true }, + { + key: 'bar', + label: 'Bar', + required: false, + properties: ['props.A', 'props.B'], + rows: [{ key: 'props.A', value: 'A' }, { key: 'props.B', value: 'B' }] + } + ] as unknown) as SectionsWithRows; + const output = render(); + expectTextsInDocument(output, [ + 'Foo', + 'No data available', + 'Bar', + 'props.A', + 'A', + 'props.B', + 'B' + ]); + }); describe('required sections', () => { it('shows "empty state message" if no data is available', () => { - const sections = [ + const sectionsWithRows = ([ { key: 'foo', label: 'Foo', required: true } - ]; - const output = render( - - ); + ] as unknown) as SectionsWithRows; + const output = render(); expectTextsInDocument(output, ['Foo', 'No data available']); }); - it('shows "empty state message" if property is not available', () => { - const sections = [ - { - key: 'foo', - label: 'Foo', - required: true, - properties: ['bar'] - } - ]; - const item = ({ - foo: { - foobar: 'bar' - } - } as unknown) as Transaction; - - const output = render(); - expectTextsInDocument(output, ['Foo', 'No data available']); - }); - }); - describe('not required sections', () => { - it('does not show section when no items are provided', () => { - const sections = [ - { - key: 'foo', - label: 'Foo', - required: false - } - ]; - const output = render( - - ); - expectTextsNotInDocument(output, ['Foo']); - }); - it('does not show section if property is not available', () => { - const sections = [ - { - key: 'foo', - label: 'Foo', - required: false, - properties: ['bar'] - } - ]; - const item = ({ - foo: { - foobar: 'bar' - } - } as unknown) as Transaction; - const output = render(); - expectTextsNotInDocument(output, ['Foo']); - }); }); }); diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/Section.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/Section.test.tsx new file mode 100644 index 0000000000000..7e68b2f84eead --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/Section.test.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 'jest-dom/extend-expect'; +import { render } from 'react-testing-library'; +import { Section } from '../Section'; +import { expectTextsInDocument } from '../../../../utils/testHelpers'; + +describe('Section', () => { + it('shows "empty state message" if no data is available', () => { + const output = render(
); + expectTextsInDocument(output, ['No data available']); + }); +}); diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/helper.test.ts b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/helper.test.ts new file mode 100644 index 0000000000000..aaf73619e481a --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/helper.test.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 { getSectionsWithRows, filterSectionsByTerm } from '../helper'; +import { LABELS, HTTP, SERVICE } from '../sections'; +import { Transaction } from '../../../../../typings/es_schemas/ui/Transaction'; + +describe('MetadataTable Helper', () => { + const sections = [ + { ...LABELS, required: true }, + HTTP, + { ...SERVICE, properties: ['environment'] } + ]; + const apmDoc = ({ + http: { + headers: { + Connection: 'close', + Host: 'opbeans:3000', + request: { method: 'get' } + } + }, + service: { + framework: { name: 'express' }, + environment: 'production' + } + } as unknown) as Transaction; + const metadataItems = getSectionsWithRows(sections, apmDoc); + + it('returns flattened data and required section', () => { + expect(metadataItems).toEqual([ + { key: 'labels', label: 'Labels', required: true, rows: [] }, + { + key: 'http', + label: 'HTTP', + rows: [ + { key: 'http.headers.Connection', value: 'close' }, + { key: 'http.headers.Host', value: 'opbeans:3000' }, + { key: 'http.headers.request.method', value: 'get' } + ] + }, + { + key: 'service', + label: 'Service', + properties: ['environment'], + rows: [{ key: 'service.environment', value: 'production' }] + } + ]); + }); + describe('filter', () => { + it('items by key', () => { + const filteredItems = filterSectionsByTerm(metadataItems, 'http'); + expect(filteredItems).toEqual([ + { + key: 'http', + label: 'HTTP', + rows: [ + { key: 'http.headers.Connection', value: 'close' }, + { key: 'http.headers.Host', value: 'opbeans:3000' }, + { key: 'http.headers.request.method', value: 'get' } + ] + } + ]); + }); + + it('items by value', () => { + const filteredItems = filterSectionsByTerm(metadataItems, 'product'); + expect(filteredItems).toEqual([ + { + key: 'service', + label: 'Service', + properties: ['environment'], + rows: [{ key: 'service.environment', value: 'production' }] + } + ]); + }); + + it('returns empty when no item matches', () => { + const filteredItems = filterSectionsByTerm(metadataItems, 'post'); + expect(filteredItems).toEqual([]); + }); + }); +}); diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/helper.ts b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/helper.ts new file mode 100644 index 0000000000000..c272790826d8d --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/helper.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 { get, pick, isEmpty } from 'lodash'; +import { Section } from './sections'; +import { Transaction } from '../../../../typings/es_schemas/ui/Transaction'; +import { APMError } from '../../../../typings/es_schemas/ui/APMError'; +import { Span } from '../../../../typings/es_schemas/ui/Span'; +import { flattenObject, KeyValuePair } from '../../../utils/flattenObject'; + +export type SectionsWithRows = ReturnType; + +export const getSectionsWithRows = ( + sections: Section[], + apmDoc: Transaction | APMError | Span +) => { + return sections + .map(section => { + const sectionData: Record = get(apmDoc, section.key); + const filteredData: + | Record + | undefined = section.properties + ? pick(sectionData, section.properties) + : sectionData; + + const rows: KeyValuePair[] = flattenObject(filteredData, section.key); + return { ...section, rows }; + }) + .filter(({ required, rows }) => required || !isEmpty(rows)); +}; + +export const filterSectionsByTerm = ( + sections: SectionsWithRows, + searchTerm: string +) => { + if (!searchTerm) { + return sections; + } + return sections + .map(section => { + const { rows = [] } = section; + const filteredRows = rows.filter(({ key, value }) => { + const valueAsString = String(value).toLowerCase(); + return ( + key.toLowerCase().includes(searchTerm) || + valueAsString.includes(searchTerm) + ); + }); + return { ...section, rows: filteredRows }; + }) + .filter(({ rows }) => !isEmpty(rows)); +}; diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/index.tsx index d7f3bf5504d40..53d54ae5de7ad 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/index.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/index.tsx @@ -9,42 +9,50 @@ import { EuiFlexItem, EuiIcon, EuiSpacer, - EuiTitle + EuiTitle, + EuiFieldSearch } from '@elastic/eui'; -import React from 'react'; -import { get, pick, isEmpty } from 'lodash'; -import { EuiText } from '@elastic/eui'; +import React, { useCallback } from 'react'; import { i18n } from '@kbn/i18n'; -import { DottedKeyValueTable } from '../DottedKeyValueTable'; +import { isEmpty } from 'lodash'; +import { EuiText } from '@elastic/eui'; import { ElasticDocsLink } from '../../shared/Links/ElasticDocsLink'; -import { Section as SectionType } from './sections'; -import { Transaction } from '../../../../typings/es_schemas/ui/Transaction'; -import { APMError } from '../../../../typings/es_schemas/ui/APMError'; -import { Span } from '../../../../typings/es_schemas/ui/Span'; - -type Item = Transaction | APMError | Span; +import { HeightRetainer } from '../HeightRetainer'; +import { Section } from './Section'; +import { history } from '../../../utils/history'; +import { fromQuery, toQuery } from '../Links/url_helpers'; +import { useLocation } from '../../../hooks/useLocation'; +import { useUrlParams } from '../../../hooks/useUrlParams'; +import { SectionsWithRows, filterSectionsByTerm } from './helper'; interface Props { - item: Item; - sections: SectionType[]; + sections: SectionsWithRows; } -const filterSections = (sections: SectionType[], item: Item) => - sections - .map(section => { - const data: Record = get(item, section.key); - return { - ...section, - data: section.properties ? pick(data, section.properties) : data - }; - }) - .filter(({ required, data }) => required || !isEmpty(data)); +export function MetadataTable({ sections }: Props) { + const location = useLocation(); + const { urlParams } = useUrlParams(); + const { searchTerm = '' } = urlParams; -export function MetadataTable({ item, sections }: Props) { - const filteredSections = filterSections(sections, item); + const filteredSections = filterSectionsByTerm(sections, searchTerm); + + const onSearchChange = useCallback( + (e: React.ChangeEvent) => { + const value = e.target.value.trim().toLowerCase(); + history.replace({ + ...location, + search: fromQuery({ + ...toQuery(location.search), + searchTerm: value + }) + }); + }, + [location] + ); + const noResultFound = Boolean(searchTerm) && isEmpty(filteredSections); return ( - + @@ -52,40 +60,49 @@ export function MetadataTable({ item, sections }: Props) { + + + - {filteredSections.map(section => ( -
- -
{section.label}
- - -
- -
- ))} + + {filteredSections.map(section => ( +
+ +
{section.label}
+ + +
+ +
+ ))} + {noResultFound && } + ); } -function Section({ - propData = {}, - propKey -}: { - propData?: Record; - propKey?: string; -}) { - if (isEmpty(propData)) { - return ( +const NoResultFound = ({ value }: { value: string }) => ( + + {i18n.translate( - 'xpack.apm.propertiesTable.agentFeature.noDataAvailableLabel', - { defaultMessage: 'No data available' } + 'xpack.apm.propertiesTable.agentFeature.noResultFound', + { + defaultMessage: `No results for "{value}".`, + values: { value } + } )} - ); - } - - return ( - - ); -} + + +); diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.test.tsx new file mode 100644 index 0000000000000..f36b91a522e92 --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.test.tsx @@ -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 React from 'react'; +import { mount, shallow } from 'enzyme'; +import { CauseStacktrace } from './CauseStacktrace'; + +describe('CauseStacktrace', () => { + describe('render', () => { + describe('with no stack trace', () => { + it('renders without the accordion', () => { + const props = { id: 'testId', message: 'testMessage' }; + + expect( + mount().find('CausedBy') + ).toHaveLength(1); + }); + }); + + describe('with no message and a stack trace', () => { + it('says "Caused by …', () => { + const props = { + id: 'testId', + stackframes: [{ filename: 'testFilename', line: { number: 1 } }] + }; + + expect( + mount() + .find('EuiTitle span') + .text() + ).toEqual('…'); + }); + }); + + describe('with a message and a stack trace', () => { + it('renders with the accordion', () => { + const props = { + id: 'testId', + message: 'testMessage', + stackframes: [{ filename: 'testFilename', line: { number: 1 } }] + }; + + expect( + shallow().find('Styled(EuiAccordion)') + ).toHaveLength(1); + }); + }); + }); +}); diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.tsx new file mode 100644 index 0000000000000..52f2ba4586718 --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.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 styled from 'styled-components'; +import theme from '@elastic/eui/dist/eui_theme_light.json'; +import { i18n } from '@kbn/i18n'; +import { EuiAccordion, EuiTitle } from '@elastic/eui'; +import { px, unit } from '../../../style/variables'; +import { Stacktrace } from '.'; +import { IStackframe } from '../../../../typings/es_schemas/raw/fields/Stackframe'; + +// @ts-ignore Styled Components has trouble inferring the types of the default props here. +const Accordion = styled(EuiAccordion)` + border-top: ${theme.euiBorderThin}; +`; + +const CausedByContainer = styled('h5')` + padding: ${theme.spacerSizes.s} 0; +`; + +const CausedByHeading = styled('span')` + color: ${theme.textColors.subdued}; + display: block; + font-size: ${theme.euiFontSizeXS}; + font-weight: ${theme.euiFontWeightBold}; + text-transform: uppercase; +`; + +const FramesContainer = styled('div')` + padding-left: ${px(unit)}; +`; + +function CausedBy({ message }: { message: string }) { + return ( + + + {i18n.translate( + 'xpack.apm.stacktraceTab.causedByFramesToogleButtonLabel', + { + defaultMessage: 'Caused By' + } + )} + + + {message} + + + ); +} + +interface CauseStacktraceProps { + codeLanguage?: string; + id: string; + message?: string; + stackframes?: IStackframe[]; +} + +export function CauseStacktrace({ + codeLanguage, + id, + message = '…', + stackframes = [] +}: CauseStacktraceProps) { + if (stackframes.length === 0) { + return ; + } + + return ( + } id={id}> + + + + + ); +} diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Context.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Context.tsx index c5d610d0b8e1b..9685ba920a73c 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Context.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Context.tsx @@ -32,7 +32,7 @@ registerLanguage('ruby', ruby); const ContextContainer = styled.div` position: relative; - border-radius: 0 0 ${borderRadius} ${borderRadius}; + border-radius: ${borderRadius}; `; const LINE_HEIGHT = units.eighth * 9; @@ -49,7 +49,7 @@ const LineNumberContainer = styled.div<{ isLibraryFrame: boolean }>` position: absolute; top: 0; left: 0; - border-radius: 0 0 0 ${borderRadius}; + border-radius: ${borderRadius}; background: ${props => props.isLibraryFrame ? theme.euiColorEmptyShade diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/FrameHeading.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/FrameHeading.tsx index c9f7158f464a4..c9f7057d2fb86 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/FrameHeading.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/FrameHeading.tsx @@ -12,16 +12,17 @@ import { IStackframe } from '../../../../typings/es_schemas/raw/fields/Stackfram import { fontFamilyCode, fontSize, px, units } from '../../../style/variables'; const FileDetails = styled.div` - color: ${theme.euiColorMediumShade}; - padding: ${px(units.half)}; + color: ${theme.euiColorDarkShade}; + padding: ${px(units.half)} 0; font-family: ${fontFamilyCode}; font-size: ${fontSize}; `; + const LibraryFrameFileDetail = styled.span` color: ${theme.euiColorDarkShade}; `; + const AppFrameFileDetail = styled.span` - font-weight: bold; color: ${theme.euiColorFullShade}; `; diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStackFrames.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStackFrames.tsx deleted file mode 100644 index 9f8229e024c37..0000000000000 --- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStackFrames.tsx +++ /dev/null @@ -1,79 +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 { EuiLink, EuiSpacer } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import React, { Fragment } from 'react'; -import styled from 'styled-components'; -import { IStackframe } from '../../../../typings/es_schemas/raw/fields/Stackframe'; -import { Ellipsis } from '../../shared/Icons'; -import { Stackframe } from './Stackframe'; - -const LibraryFrameToggle = styled.div` - user-select: none; -`; - -interface Props { - stackframes: IStackframe[]; - codeLanguage?: string; - initialVisiblity: boolean; -} - -interface State { - isVisible: boolean; -} - -export class LibraryStackFrames extends React.Component { - public state = { - isVisible: this.props.initialVisiblity - }; - - public onClick = () => { - this.setState(({ isVisible }) => ({ isVisible: !isVisible })); - }; - - public render() { - const { stackframes, codeLanguage } = this.props; - const { isVisible } = this.state; - if (stackframes.length === 0) { - return null; - } - - return ( -
- - - {' '} - {i18n.translate( - 'xpack.apm.stacktraceTab.libraryFramesToogleButtonLabel', - { - defaultMessage: - '{count, plural, one {# library frame} other {# library frames}}', - values: { count: stackframes.length } - } - )} - - - -
- {isVisible && ( - - - {stackframes.map((stackframe, i) => ( - - ))} - - )} -
-
- ); - } -} diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.test.tsx new file mode 100644 index 0000000000000..94751f9d0461d --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.test.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 { shallow } from 'enzyme'; +import { LibraryStacktrace } from './LibraryStacktrace'; + +describe('LibraryStacktrace', () => { + describe('render', () => { + describe('with no stack frames', () => { + it('renders null', () => { + const props = { id: 'testId', stackframes: [] }; + + expect(shallow().html()).toBeNull(); + }); + }); + + describe('with stack frames', () => { + it('renders an accordion', () => { + const props = { + id: 'testId', + stackframes: [{ filename: 'testFilename', line: { number: 1 } }] + }; + + expect( + shallow().find('EuiAccordion') + ).toHaveLength(1); + }); + }); + }); +}); diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.tsx new file mode 100644 index 0000000000000..f62ba95407893 --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.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 { EuiAccordion } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; +import React from 'react'; +import styled from 'styled-components'; +import { IStackframe } from '../../../../typings/es_schemas/raw/fields/Stackframe'; +import { Stackframe } from './Stackframe'; +import { px, unit } from '../../../style/variables'; + +const FramesContainer = styled('div')` + padding-left: ${px(unit)}; +`; + +interface Props { + codeLanguage?: string; + stackframes: IStackframe[]; + id: string; +} + +export function LibraryStacktrace({ codeLanguage, id, stackframes }: Props) { + if (stackframes.length === 0) { + return null; + } + + return ( + + + {stackframes.map((stackframe, i) => ( + + ))} + + + ); +} diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Stackframe.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Stackframe.tsx index cd6c7ce9224a5..a307cc56cc71a 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Stackframe.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Stackframe.tsx @@ -7,6 +7,7 @@ import theme from '@elastic/eui/dist/eui_theme_light.json'; import React from 'react'; import styled from 'styled-components'; +import { EuiAccordion } from '@elastic/eui'; import { IStackframe, IStackframeWithLineContext @@ -16,16 +17,11 @@ import { fontFamilyCode, fontSize } from '../../../style/variables'; -import { FrameHeading } from '../Stacktrace/FrameHeading'; +import { FrameHeading } from './FrameHeading'; import { Context } from './Context'; import { Variables } from './Variables'; -const CodeHeader = styled.div` - border-bottom: 1px solid ${theme.euiColorLightShade}; - border-radius: ${borderRadius} ${borderRadius} 0 0; -`; - -const Container = styled.div<{ isLibraryFrame: boolean }>` +const ContextContainer = styled.div<{ isLibraryFrame: boolean }>` position: relative; font-family: ${fontFamilyCode}; font-size: ${fontSize}; @@ -40,12 +36,16 @@ const Container = styled.div<{ isLibraryFrame: boolean }>` interface Props { stackframe: IStackframe; codeLanguage?: string; + id: string; + initialIsOpen?: boolean; isLibraryFrame?: boolean; } export function Stackframe({ stackframe, codeLanguage, + id, + initialIsOpen = false, isLibraryFrame = false }: Props) { if (!hasLineContext(stackframe)) { @@ -55,19 +55,22 @@ export function Stackframe({ } return ( - - + - - - - + } + id={id} + initialIsOpen={initialIsOpen} + > + + + - + ); } diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Variables.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Variables.tsx index 34c46f84c76b9..6d1b10c90a999 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Variables.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Variables.tsx @@ -11,11 +11,11 @@ import { i18n } from '@kbn/i18n'; import React from 'react'; import { borderRadius, px, unit, units } from '../../../style/variables'; import { IStackframe } from '../../../../typings/es_schemas/raw/fields/Stackframe'; -import { DottedKeyValueTable } from '../DottedKeyValueTable'; +import { KeyValueTable } from '../KeyValueTable'; +import { flattenObject } from '../../../utils/flattenObject'; const VariablesContainer = styled.div` background: ${theme.euiColorEmptyShade}; - border-top: 1px solid ${theme.euiColorLightShade}; border-radius: 0 0 ${borderRadius} ${borderRadius}; padding: ${px(units.half)} ${px(unit)}; `; @@ -24,29 +24,27 @@ interface Props { vars: IStackframe['vars']; } -export class Variables extends React.Component { - public render() { - if (!this.props.vars) { - return null; - } - - return ( - - - - - - - - - - ); +export const Variables = ({ vars }: Props) => { + if (!vars) { + return null; } -} + const flattenedVariables = flattenObject(vars); + return ( + + + + + + + + + + ); +}; diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/Stackframe.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/Stackframe.test.tsx index b0052e8c17b64..5f6519b7c7b96 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/Stackframe.test.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/Stackframe.test.tsx @@ -16,7 +16,7 @@ describe('Stackframe', () => { let wrapper: ReactWrapper; beforeEach(() => { const stackframe = stacktracesMock[0]; - wrapper = mount(); + wrapper = mount(); }); it('should render correctly', () => { @@ -38,7 +38,7 @@ describe('Stackframe', () => { let wrapper: ReactWrapper; beforeEach(() => { const stackframe = { line: {} } as IStackframe; - wrapper = mount(); + wrapper = mount(); }); it('should render only FrameHeading', () => { @@ -55,7 +55,7 @@ describe('Stackframe', () => { it('should respect isLibraryFrame', () => { const stackframe = { line: {} } as IStackframe; const wrapper = shallow( - + ); expect(wrapper.find('FrameHeading').prop('isLibraryFrame')).toBe(true); }); diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap index 1b465db1c6263..55cec7389dc5c 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap +++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap @@ -1,24 +1,23 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Stackframe when stackframe has source lines should render correctly 1`] = ` -.c2 { - color: #98a2b3; - padding: 8px; +.c0 { + color: #69707d; + padding: 8px 0; font-family: "SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace; font-size: 14px; } -.c3 { - font-weight: bold; +.c1 { color: #000000; } -.c4 { +.c3 { position: relative; - border-radius: 0 0 4px 4px; + border-radius: 4px; } -.c5 { +.c4 { position: absolute; width: 100%; height: 18px; @@ -27,15 +26,15 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`] background-color: #fef6e5; } -.c6 { +.c5 { position: absolute; top: 0; left: 0; - border-radius: 0 0 0 4px; + border-radius: 4px; background: #f5f7fa; } -.c7 { +.c6 { position: relative; min-width: 42px; padding-left: 8px; @@ -46,11 +45,11 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`] border-right: 1px solid #d3dae6; } -.c7:last-of-type { +.c6:last-of-type { border-radius: 0 0 0 4px; } -.c8 { +.c7 { position: relative; min-width: 42px; padding-left: 8px; @@ -62,22 +61,22 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`] background-color: #fef6e5; } -.c8:last-of-type { +.c7:last-of-type { border-radius: 0 0 0 4px; } -.c9 { +.c8 { overflow: auto; margin: 0 0 0 42px; padding: 0; background-color: #ffffff; } -.c9:last-of-type { +.c8:last-of-type { border-radius: 0 0 4px 0; } -.c10 { +.c9 { margin: 0; color: inherit; background: inherit; @@ -88,7 +87,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`] line-height: 18px; } -.c11 { +.c10 { position: relative; padding: 0; margin: 0; @@ -96,12 +95,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`] z-index: 2; } -.c1 { - border-bottom: 1px solid #d3dae6; - border-radius: 4px 4px 0 0; -} - -.c0 { +.c2 { position: relative; font-family: "SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace; font-size: 14px; @@ -111,6 +105,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`] } - -
- -
- ", - "library_frame": false, - "line": Object { - "context": " client.query('SELECT id FROM customers WHERE id=$1', [req.body.customer_id], next())", - "number": 307, - }, - } - } - > - -
- - - server/routes.js - - - in - - - - <anonymous> - - - at - - - line - 307 - - -
- - -
- - + } + id="test" + initialIsOpen={false} + paddingSize="none" + > +
+
- -
+ - -
- - + + + + + + ", + "library_frame": false, + "line": Object { + "context": " client.query('SELECT id FROM customers WHERE id=$1', [req.body.customer_id], next())", + "number": 307, + }, + } + } > -
- -
- 305 - . -
- - -
- 306 - . -
- - -
- 307 - . -
- - -
- 308 - . -
- - +
-
- 309 - . -
- -
- - -
- - - 
+                    
-                      
-                        
-                              })
-                        
-                      
-
- - - - - 
+                  
+                   in
+                   
+                  
+                    
-                      
-                        
-                          
-
-                        
-                      
-
- - - - - 
+                  
+                   at 
+                  
+                    
-                      
-                        
-                              client.query(
-                          
-                            'SELECT id FROM customers WHERE id=$1'
-                          
-                          , [req.body.customer_id], next())
-                        
-                      
-
- - - + +
+ + + + +
+
+ +
+
+ +
- ", + "library_frame": false, + "line": Object { + "context": " client.query('SELECT id FROM customers WHERE id=$1', [req.body.customer_id], next())", + "number": 307, + }, } } > - 
-                      
-                        
+                      

+                        
+                          

+                        
+                        
-                              req.body.lines.forEach(
-                          
-                            
+                              

+                                305
+                                .
+                              

+                            
+                            
+                              

+                                306
+                                .
+                              

+                            
+                            
+                              

+                                307
+                                .
+                              

+                            
+                            
+                              

+                                308
+                                .
+                              

+                            
+                            
+                              

+                                309
+                                .
+                              

+                            
+                          

+                        
+                        
+                          

+                            
-                              function
-                            
-                             (
-                            
+                                
+                                  
+                                    
+                                          })
+                                    
+                                  
+                                

+                              
+                            
+                            
-                              line
-                            
-                            ) 
-                          
-                          {
-                        
-                      
-
- - - - - 
-                      
-                        
-                                client.query(
-                          
+                                
+                                  
+                                    
+                                      
+
+                                    
+                                  
+                                

+                              
+                            
+                            
-                            'SELECT id FROM products WHERE id=$1'
-                          
-                          , [line.id], next())
-                        
-                      
-
- - -
- + key=" client.query('SELECT id FROM customers WHERE id=$1', [req.body.customer_id], next())2" + language="javascript" + style={ + Object { + "hljs": Object { + "background": "#fff", + "color": "black", + "display": "block", + "overflowX": "auto", + "padding": "0.5em", + }, + "hljs-addition": Object { + "backgroundColor": "#baeeba", + }, + "hljs-attr": Object { + "color": "#5c2699", + }, + "hljs-attribute": Object { + "color": "#000", + }, + "hljs-built_in": Object { + "color": "#5c2699", + }, + "hljs-builtin-name": Object { + "color": "#5c2699", + }, + "hljs-bullet": Object { + "color": "#1c00cf", + }, + "hljs-class .hljs-title": Object { + "color": "#5c2699", + }, + "hljs-comment": Object { + "color": "#006a00", + }, + "hljs-deletion": Object { + "backgroundColor": "#ffc8bd", + }, + "hljs-doctag": Object { + "fontWeight": "bold", + }, + "hljs-emphasis": Object { + "fontStyle": "italic", + }, + "hljs-formula": Object { + "backgroundColor": "#eee", + "fontStyle": "italic", + }, + "hljs-keyword": Object { + "color": "#aa0d91", + }, + "hljs-link": Object { + "color": "#080", + }, + "hljs-literal": Object { + "color": "#aa0d91", + }, + "hljs-meta": Object { + "color": "#1c00cf", + }, + "hljs-name": Object { + "color": "#008", + }, + "hljs-number": Object { + "color": "#1c00cf", + }, + "hljs-params": Object { + "color": "#5c2699", + }, + "hljs-quote": Object { + "color": "#006a00", + }, + "hljs-regexp": Object { + "color": "#080", + }, + "hljs-section": Object { + "color": "#5c2699", + }, + "hljs-selector-class": Object { + "color": "#9b703f", + }, + "hljs-selector-id": Object { + "color": "#9b703f", + }, + "hljs-selector-tag": Object { + "color": "#aa0d91", + }, + "hljs-string": Object { + "color": "#c41a16", + }, + "hljs-strong": Object { + "fontWeight": "bold", + }, + "hljs-subst": Object { + "color": "#000", + }, + "hljs-symbol": Object { + "color": "#1c00cf", + }, + "hljs-tag": Object { + "color": "#1c00cf", + }, + "hljs-template-variable": Object { + "color": "#660", + }, + "hljs-title": Object { + "color": "#1c00cf", + }, + "hljs-type": Object { + "color": "#5c2699", + }, + "hljs-variable": Object { + "color": "#660", + }, + } + } + > + + 
+                                  
+                                    
+                                          client.query(
+                                      
+                                        'SELECT id FROM customers WHERE id=$1'
+                                      
+                                      , [req.body.customer_id], next())
+                                    
+                                  
+
+ + + + + 
+                                  
+                                    
+                                          req.body.lines.forEach(
+                                      
+                                        
+                                          function
+                                        
+                                         (
+                                        
+                                          line
+                                        
+                                        ) 
+                                      
+                                      {
+                                    
+                                  
+
+ + + + + 
+                                  
+                                    
+                                            client.query(
+                                      
+                                        'SELECT id FROM products WHERE id=$1'
+                                      
+                                      , [line.id], next())
+                                    
+                                  
+
+ + +
+ +
+ + +
+ + +
- - - + +
- + `; diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/index.tsx index ffa740792cede..ca14be237d22b 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/index.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/index.tsx @@ -10,7 +10,7 @@ import { isEmpty, last } from 'lodash'; import React, { Fragment } from 'react'; import { IStackframe } from '../../../../typings/es_schemas/raw/fields/Stackframe'; import { EmptyMessage } from '../../shared/EmptyMessage'; -import { LibraryStackFrames } from './LibraryStackFrames'; +import { LibraryStacktrace } from './LibraryStacktrace'; import { Stackframe } from './Stackframe'; interface Props { @@ -25,7 +25,7 @@ export function Stacktrace({ stackframes = [], codeLanguage }: Props) { heading={i18n.translate( 'xpack.apm.stacktraceTab.noStacktraceAvailableLabel', { - defaultMessage: 'No stacktrace available.' + defaultMessage: 'No stack trace available.' } )} hideSubheading @@ -34,16 +34,17 @@ export function Stacktrace({ stackframes = [], codeLanguage }: Props) { } const groups = getGroupedStackframes(stackframes); + return ( {groups.map((group, i) => { // library frame - if (group.isLibraryFrame) { + if (group.isLibraryFrame && groups.length > 1) { return ( - @@ -56,7 +57,12 @@ export function Stacktrace({ stackframes = [], codeLanguage }: Props) { return group.stackframes.map((stackframe, idx) => ( {idx > 0 && } - + 1} + stackframe={stackframe} + /> )); })} diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Summary/TransactionSummary.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Summary/TransactionSummary.tsx index 8f91b8cc5e2af..b6e783a00b5d6 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/Summary/TransactionSummary.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/Summary/TransactionSummary.tsx @@ -61,7 +61,7 @@ const TransactionSummary = ({ ) : null ]; - return ; + return ; }; export { TransactionSummary }; diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/getTimezoneOffsetInMs.test.ts b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/getTimezoneOffsetInMs.test.ts index 0605c7dc8b02a..dc815145db4ad 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/getTimezoneOffsetInMs.test.ts +++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/getTimezoneOffsetInMs.test.ts @@ -7,7 +7,8 @@ import { getTimezoneOffsetInMs } from './getTimezoneOffsetInMs'; import moment from 'moment-timezone'; -describe('getTimezoneOffsetInMs', () => { +// FAILING: https://github.com/elastic/kibana/issues/50005 +describe.skip('getTimezoneOffsetInMs', () => { describe('when no default timezone is set', () => { it('guesses the timezone', () => { const guess = jest.fn(() => 'Etc/UTC'); diff --git a/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/helpers.ts b/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/helpers.ts index 29a27f034be8a..75b5e0f2a05c8 100644 --- a/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/helpers.ts +++ b/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/helpers.ts @@ -8,6 +8,13 @@ import { compact, pick } from 'lodash'; import datemath from '@elastic/datemath'; import { IUrlParams } from './types'; +interface PathParams { + processorEvent?: 'error' | 'metric' | 'transaction'; + serviceName?: string; + errorGroupId?: string; + serviceNodeName?: string; +} + export function getParsedDate(rawDate?: string, opts = {}) { if (rawDate) { const parsed = datemath.parse(rawDate, opts); @@ -56,7 +63,7 @@ export function removeUndefinedProps(obj: T): Partial { return pick(obj, value => value !== undefined); } -export function getPathParams(pathname: string = '') { +export function getPathParams(pathname: string = ''): PathParams { const paths = getPathAsArray(pathname); const pageName = paths[0]; @@ -92,17 +99,15 @@ export function getPathParams(pathname: string = '') { }; case 'nodes': return { + processorEvent: 'metric', serviceName }; case 'service-map': return { - processorEvent: 'service-map', serviceName }; default: - return { - processorEvent: 'transaction' - }; + return {}; } case 'traces': diff --git a/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/resolveUrlParams.ts b/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/resolveUrlParams.ts index febe0691d7c1c..7972bdbcf2ee6 100644 --- a/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/resolveUrlParams.ts +++ b/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/resolveUrlParams.ts @@ -53,7 +53,8 @@ export function resolveUrlParams(location: Location, state: TimeUrlParams) { refreshInterval = TIMEPICKER_DEFAULTS.refreshInterval, rangeFrom = TIMEPICKER_DEFAULTS.rangeFrom, rangeTo = TIMEPICKER_DEFAULTS.rangeTo, - environment + environment, + searchTerm } = query; const localUIFilters = pickKeys(query, ...localUIFilterNames); @@ -81,6 +82,7 @@ export function resolveUrlParams(location: Location, state: TimeUrlParams) { kuery: kuery && decodeURIComponent(kuery), transactionName, transactionType, + searchTerm: toString(searchTerm), // path params processorEvent, diff --git a/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/types.ts b/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/types.ts index ca4e0413aa4bf..fc5f5dfb6e301 100644 --- a/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/types.ts +++ b/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/types.ts @@ -29,4 +29,6 @@ export type IUrlParams = { page?: number; pageSize?: number; serviceNodeName?: string; + searchTerm?: string; + processorEvent?: 'transaction' | 'error' | 'metric'; } & Partial>; diff --git a/x-pack/legacy/plugins/apm/public/hooks/useKueryBarIndexPattern.ts b/x-pack/legacy/plugins/apm/public/hooks/useKueryBarIndexPattern.ts new file mode 100644 index 0000000000000..5fb9405559d56 --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/hooks/useKueryBarIndexPattern.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 { useFetcher } from './useFetcher'; + +export function useKueryBarIndexPattern( + processorEvent: 'transaction' | 'metric' | 'error' | undefined +) { + const { data: indexPattern, status } = useFetcher( + callApmApi => { + return callApmApi({ + pathname: '/api/apm/kuery_bar_index_pattern', + forceCache: true, + params: { + query: { + processorEvent + } + } + }); + }, + [processorEvent] + ); + + return { + indexPattern, + status + }; +} diff --git a/x-pack/legacy/plugins/apm/public/selectors/chartSelectors.ts b/x-pack/legacy/plugins/apm/public/selectors/chartSelectors.ts index 4b65190d8ef22..b15231e89365a 100644 --- a/x-pack/legacy/plugins/apm/public/selectors/chartSelectors.ts +++ b/x-pack/legacy/plugins/apm/public/selectors/chartSelectors.ts @@ -11,7 +11,6 @@ import mean from 'lodash.mean'; import { rgba } from 'polished'; import { TimeSeriesAPIResponse } from '../../server/lib/transactions/charts'; import { ApmTimeSeriesResponse } from '../../server/lib/transactions/charts/get_timeseries_data/transform'; -import { StringMap } from '../../typings/common'; import { Coordinate, RectCoordinate, @@ -192,7 +191,7 @@ function getColorByKey(keys: string[]) { const assignedColors = ['HTTP 2xx', 'HTTP 3xx', 'HTTP 4xx', 'HTTP 5xx']; const unknownKeys = difference(keys, assignedColors); - const unassignedColors: StringMap = zipObject(unknownKeys, [ + const unassignedColors: Record = zipObject(unknownKeys, [ theme.euiColorVis1, theme.euiColorVis3, theme.euiColorVis4, diff --git a/x-pack/legacy/plugins/apm/public/services/__test__/SessionStorageMock.ts b/x-pack/legacy/plugins/apm/public/services/__test__/SessionStorageMock.ts index abe44a0fb3934..83e8f020e2529 100644 --- a/x-pack/legacy/plugins/apm/public/services/__test__/SessionStorageMock.ts +++ b/x-pack/legacy/plugins/apm/public/services/__test__/SessionStorageMock.ts @@ -4,10 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ -import { StringMap } from '../../../typings/common'; - export class SessionStorageMock { - private store: StringMap = {}; + private store: Record = {}; public clear() { this.store = {}; diff --git a/x-pack/legacy/plugins/apm/public/services/rest/ml.ts b/x-pack/legacy/plugins/apm/public/services/rest/ml.ts index 9150c63127317..28b14fa722bbd 100644 --- a/x-pack/legacy/plugins/apm/public/services/rest/ml.ts +++ b/x-pack/legacy/plugins/apm/public/services/rest/ml.ts @@ -4,7 +4,6 @@ * you may not use this file except in compliance with the Elastic License. */ -import { npStart } from 'ui/new_platform'; import { HttpServiceBase } from 'kibana/public'; import { PROCESSOR_EVENT, @@ -14,6 +13,7 @@ import { import { getMlJobId, getMlPrefix } from '../../../common/ml_job_constants'; import { callApi } from './callApi'; import { ESFilter } from '../../../typings/elasticsearch'; +import { createCallApmApi, APMClient } from './createCallApmApi'; interface MlResponseItem { id: string; @@ -32,7 +32,14 @@ interface StartedMLJobApiResponse { jobs: MlResponseItem[]; } -const { core } = npStart; +async function getTransactionIndices(http: HttpServiceBase) { + const callApmApi: APMClient = createCallApmApi(http); + const indices = await callApmApi({ + method: 'GET', + pathname: `/api/apm/settings/apm-indices` + }); + return indices['apm_oss.transactionIndices']; +} export async function startMLJob({ serviceName, @@ -43,9 +50,7 @@ export async function startMLJob({ transactionType: string; http: HttpServiceBase; }) { - const indexPatternName = core.injectedMetadata.getInjectedVar( - 'apmTransactionIndices' - ); + const transactionIndices = await getTransactionIndices(http); const groups = ['apm', serviceName.toLowerCase()]; const filter: ESFilter[] = [ { term: { [SERVICE_NAME]: serviceName } }, @@ -59,7 +64,7 @@ export async function startMLJob({ body: JSON.stringify({ prefix: getMlPrefix(serviceName, transactionType), groups, - indexPatternName, + indexPatternName: transactionIndices, startDatafeed: true, query: { bool: { diff --git a/x-pack/legacy/plugins/apm/public/services/rest/xpack.ts b/x-pack/legacy/plugins/apm/public/services/rest/xpack.ts index 146376665a0e6..95e283cd67709 100644 --- a/x-pack/legacy/plugins/apm/public/services/rest/xpack.ts +++ b/x-pack/legacy/plugins/apm/public/services/rest/xpack.ts @@ -5,7 +5,6 @@ */ import { HttpServiceBase } from 'kibana/public'; -import { StringMap } from '../../../typings/common'; import { callApi } from './callApi'; export interface LicenseApiResponse { @@ -13,11 +12,11 @@ export interface LicenseApiResponse { is_active: boolean; }; features: { - beats_management?: StringMap; - graph?: StringMap; - grokdebugger?: StringMap; - index_management?: StringMap; - logstash?: StringMap; + beats_management?: Record; + graph?: Record; + grokdebugger?: Record; + index_management?: Record; + logstash?: Record; ml?: { is_available: boolean; license_type: number; @@ -25,12 +24,12 @@ export interface LicenseApiResponse { enable_links: boolean; show_links: boolean; }; - reporting?: StringMap; - rollup?: StringMap; - searchprofiler?: StringMap; - security?: StringMap; - spaces?: StringMap; - tilemap?: StringMap; + reporting?: Record; + rollup?: Record; + searchprofiler?: Record; + security?: Record; + spaces?: Record; + tilemap?: Record; watcher?: { is_available: boolean; enable_links: boolean; diff --git a/x-pack/legacy/plugins/apm/public/utils/__test__/flattenObject.test.ts b/x-pack/legacy/plugins/apm/public/utils/__test__/flattenObject.test.ts new file mode 100644 index 0000000000000..8ec826c7f3d08 --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/utils/__test__/flattenObject.test.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 { flattenObject } from '../flattenObject'; + +describe('FlattenObject', () => { + it('flattens multi level item', () => { + const data = { + foo: { + item1: 'value 1', + item2: { itemA: 'value 2' } + }, + bar: { + item3: { itemA: { itemAB: 'value AB' } }, + item4: 'value 4', + item5: [1], + item6: [1, 2, 3] + } + }; + + const flatten = flattenObject(data); + expect(flatten).toEqual([ + { key: 'bar.item3.itemA.itemAB', value: 'value AB' }, + { key: 'bar.item4', value: 'value 4' }, + { key: 'bar.item5', value: 1 }, + { key: 'bar.item6.0', value: 1 }, + { key: 'bar.item6.1', value: 2 }, + { key: 'bar.item6.2', value: 3 }, + { key: 'foo.item1', value: 'value 1' }, + { key: 'foo.item2.itemA', value: 'value 2' } + ]); + }); + it('returns an empty array if no valid object is provided', () => { + expect(flattenObject({})).toEqual([]); + expect(flattenObject(null)).toEqual([]); + expect(flattenObject(undefined)).toEqual([]); + }); +}); diff --git a/x-pack/legacy/plugins/apm/public/utils/flattenObject.ts b/x-pack/legacy/plugins/apm/public/utils/flattenObject.ts new file mode 100644 index 0000000000000..01a58ac03d0c3 --- /dev/null +++ b/x-pack/legacy/plugins/apm/public/utils/flattenObject.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 { compact, isObject } from 'lodash'; + +export interface KeyValuePair { + key: string; + value: unknown; +} + +export const flattenObject = ( + item: Record | null | undefined, + parentKey?: string +): KeyValuePair[] => { + if (item) { + const isArrayWithSingleValue = Array.isArray(item) && item.length === 1; + return Object.keys(item) + .sort() + .reduce((acc: KeyValuePair[], key) => { + const childKey = isArrayWithSingleValue ? '' : key; + const currentKey = compact([parentKey, childKey]).join('.'); + // item[key] can be a primitive (string, number, boolean, null, undefined) or Object or Array + if (isObject(item[key])) { + return acc.concat(flattenObject(item[key], currentKey)); + } else { + acc.push({ key: currentKey, value: item[key] }); + return acc; + } + }, []); + } + return []; +}; diff --git a/x-pack/legacy/plugins/apm/public/utils/httpStatusCodeToColor.ts b/x-pack/legacy/plugins/apm/public/utils/httpStatusCodeToColor.ts index db1ed490eb7f2..130a7b52ea33b 100644 --- a/x-pack/legacy/plugins/apm/public/utils/httpStatusCodeToColor.ts +++ b/x-pack/legacy/plugins/apm/public/utils/httpStatusCodeToColor.ts @@ -5,8 +5,6 @@ */ import theme from '@elastic/eui/dist/eui_theme_light.json'; -import { StringMap } from '../../typings/common'; - const { euiColorDarkShade, euiColorWarning } = theme; export const errorColor = '#c23c2b'; @@ -14,7 +12,7 @@ export const neutralColor = euiColorDarkShade; export const successColor = '#327a42'; export const warningColor = euiColorWarning; -const httpStatusCodeColors: StringMap = { +const httpStatusCodeColors: Record = { 1: neutralColor, 2: successColor, 3: neutralColor, diff --git a/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx b/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx index 2e3c8940680fe..a18882120fe75 100644 --- a/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx +++ b/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx @@ -102,6 +102,15 @@ interface MockSetup { has: any; }; uiFiltersES: ESFilter[]; + indices: { + 'apm_oss.sourcemapIndices': string; + 'apm_oss.errorIndices': string; + 'apm_oss.onboardingIndices': string; + 'apm_oss.spanIndices': string; + 'apm_oss.transactionIndices': string; + 'apm_oss.metricsIndices': string; + 'apm_oss.apmAgentConfigurationIndex': string; + }; } export async function inspectSearchParams( @@ -127,7 +136,16 @@ export async function inspectSearchParams( { term: { 'service.environment': 'prod' } } - ] + ], + indices: { + 'apm_oss.sourcemapIndices': 'myIndex', + 'apm_oss.errorIndices': 'myIndex', + 'apm_oss.onboardingIndices': 'myIndex', + 'apm_oss.spanIndices': 'myIndex', + 'apm_oss.transactionIndices': 'myIndex', + 'apm_oss.metricsIndices': 'myIndex', + 'apm_oss.apmAgentConfigurationIndex': 'myIndex' + } }; try { await fn(mockSetup); diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__tests__/__snapshots__/get_buckets.test.ts.snap b/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__tests__/__snapshots__/get_buckets.test.ts.snap index 8d89e22fa9864..d336d71424750 100644 --- a/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__tests__/__snapshots__/get_buckets.test.ts.snap +++ b/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__tests__/__snapshots__/get_buckets.test.ts.snap @@ -50,7 +50,7 @@ Array [ }, "size": 0, }, - "index": "myIndex", + "index": "apm-*", }, ], ] diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__tests__/get_buckets.test.ts b/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__tests__/get_buckets.test.ts index 0b8cd8ae8703f..b7081c43465bf 100644 --- a/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__tests__/get_buckets.test.ts +++ b/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__tests__/get_buckets.test.ts @@ -39,7 +39,16 @@ describe('timeseriesFetcher', () => { { term: { 'service.environment': 'prod' } } - ] + ], + indices: { + 'apm_oss.sourcemapIndices': 'apm-*', + 'apm_oss.errorIndices': 'apm-*', + 'apm_oss.onboardingIndices': 'apm-*', + 'apm_oss.spanIndices': 'apm-*', + 'apm_oss.transactionIndices': 'apm-*', + 'apm_oss.metricsIndices': 'apm-*', + 'apm_oss.apmAgentConfigurationIndex': '.apm-agent-configuration' + } } }); }); diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/distribution/get_buckets.ts b/x-pack/legacy/plugins/apm/server/lib/errors/distribution/get_buckets.ts index 6059f2b0051a7..afb8237178a20 100644 --- a/x-pack/legacy/plugins/apm/server/lib/errors/distribution/get_buckets.ts +++ b/x-pack/legacy/plugins/apm/server/lib/errors/distribution/get_buckets.ts @@ -25,7 +25,7 @@ export async function getBuckets({ bucketSize: number; setup: Setup; }) { - const { start, end, uiFiltersES, client, config } = setup; + const { start, end, uiFiltersES, client, indices } = setup; const filter: ESFilter[] = [ { term: { [PROCESSOR_EVENT]: 'error' } }, { term: { [SERVICE_NAME]: serviceName } }, @@ -38,7 +38,7 @@ export async function getBuckets({ } const params = { - index: config.get('apm_oss.errorIndices'), + index: indices['apm_oss.errorIndices'], body: { size: 0, query: { diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/get_error_group.ts b/x-pack/legacy/plugins/apm/server/lib/errors/get_error_group.ts index dee5deb4064e4..caadbfef32698 100644 --- a/x-pack/legacy/plugins/apm/server/lib/errors/get_error_group.ts +++ b/x-pack/legacy/plugins/apm/server/lib/errors/get_error_group.ts @@ -29,10 +29,10 @@ export async function getErrorGroup({ groupId: string; setup: Setup; }) { - const { start, end, uiFiltersES, client, config } = setup; + const { start, end, uiFiltersES, client, indices } = setup; const params = { - index: config.get('apm_oss.errorIndices'), + index: indices['apm_oss.errorIndices'], body: { size: 1, query: { diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/get_trace_errors_per_transaction.ts b/x-pack/legacy/plugins/apm/server/lib/errors/get_trace_errors_per_transaction.ts index aaac56d16c599..9a6aed02e2a84 100644 --- a/x-pack/legacy/plugins/apm/server/lib/errors/get_trace_errors_per_transaction.ts +++ b/x-pack/legacy/plugins/apm/server/lib/errors/get_trace_errors_per_transaction.ts @@ -24,10 +24,10 @@ export async function getTraceErrorsPerTransaction( traceId: string, setup: Setup ): Promise { - const { start, end, client, config } = setup; + const { start, end, client, indices } = setup; const params = { - index: config.get('apm_oss.errorIndices'), + index: indices['apm_oss.errorIndices'], body: { size: 0, query: { diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts index 9b2c97fab7aa3..ee41599454dd6 100644 --- a/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts +++ b/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts @@ -12,9 +12,9 @@ import { IndicesCreateParams } from 'elasticsearch'; import { Legacy } from 'kibana'; -import { cloneDeep, has, isString, set } from 'lodash'; +import { cloneDeep, has, isString, set, pick } from 'lodash'; import { OBSERVER_VERSION_MAJOR } from '../../../common/elasticsearch_fieldnames'; -import { StringMap } from '../../../typings/common'; +import { getApmIndices } from '../settings/apm_indices/get_apm_indices'; import { ESSearchResponse, ESSearchRequest @@ -23,17 +23,6 @@ import { // `type` was deprecated in 7.0 export type APMIndexDocumentParams = Omit, 'type'>; -function getApmIndices(config: Legacy.KibanaConfig) { - return [ - config.get('apm_oss.errorIndices'), - config.get('apm_oss.metricsIndices'), - config.get('apm_oss.onboardingIndices'), - config.get('apm_oss.sourcemapIndices'), - config.get('apm_oss.spanIndices'), - config.get('apm_oss.transactionIndices') - ]; -} - export function isApmIndex( apmIndices: string[], indexParam: SearchParams['index'] @@ -76,10 +65,23 @@ async function getParamsForSearchRequest( params: SearchParams, apmOptions?: APMOptions ) { - const config = req.server.config(); const uiSettings = req.getUiSettingsService(); - const apmIndices = getApmIndices(config); - const includeFrozen = await uiSettings.get('search:includeFrozen'); + const [indices, includeFrozen] = await Promise.all([ + getApmIndices(req.server), + uiSettings.get('search:includeFrozen') + ]); + + // Get indices for legacy data filter (only those which apply) + const apmIndices: string[] = Object.values( + pick(indices, [ + 'apm_oss.sourcemapIndices', + 'apm_oss.errorIndices', + 'apm_oss.onboardingIndices', + 'apm_oss.spanIndices', + 'apm_oss.transactionIndices', + 'apm_oss.metricsIndices' + ]) + ); return { ...addFilterForLegacyData(apmIndices, params, apmOptions), // filter out pre-7.0 data ignore_throttled: !includeFrozen // whether to query frozen indices or not @@ -92,7 +94,7 @@ interface APMOptions { export function getESClient(req: Legacy.Request) { const cluster = req.server.plugins.elasticsearch.getCluster('data'); - const query = req.query as StringMap; + const query = req.query as Record; return { search: async < diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/saved_objects_client.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/saved_objects_client.ts index 3070d7b00b684..81dd8b34c8847 100644 --- a/x-pack/legacy/plugins/apm/server/lib/helpers/saved_objects_client.ts +++ b/x-pack/legacy/plugins/apm/server/lib/helpers/saved_objects_client.ts @@ -6,10 +6,10 @@ import { Server } from 'hapi'; -export function getSavedObjectsClient(server: Server) { +export function getSavedObjectsClient(server: Server, clusterName = 'admin') { const { SavedObjectsClient, getSavedObjectsRepository } = server.savedObjects; const { callWithInternalUser } = server.plugins.elasticsearch.getCluster( - 'admin' + clusterName ); const internalRepository = getSavedObjectsRepository(callWithInternalUser); return new SavedObjectsClient(internalRepository); diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.test.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.test.ts index e8cf56fcd0802..57de438be7f2a 100644 --- a/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.test.ts +++ b/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.test.ts @@ -3,11 +3,22 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ - import { Legacy } from 'kibana'; import { setupRequest } from './setup_request'; import { uiSettingsServiceMock } from 'src/core/server/mocks'; +jest.mock('../settings/apm_indices/get_apm_indices', () => ({ + getApmIndices: async () => ({ + 'apm_oss.sourcemapIndices': 'apm-*', + 'apm_oss.errorIndices': 'apm-*', + 'apm_oss.onboardingIndices': 'apm-*', + 'apm_oss.spanIndices': 'apm-*', + 'apm_oss.transactionIndices': 'apm-*', + 'apm_oss.metricsIndices': 'apm-*', + 'apm_oss.apmAgentConfigurationIndex': 'apm-*' + }) +})); + function getMockRequest() { const callWithRequestSpy = jest.fn(); const mockRequest = ({ diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts index 4054537e04b40..3ec519d5e71b5 100644 --- a/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts +++ b/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts @@ -10,6 +10,7 @@ import moment from 'moment'; import { getESClient } from './es_client'; import { getUiFiltersES } from './convert_ui_filters/get_ui_filters_es'; import { PromiseReturnType } from '../../../typings/common'; +import { getApmIndices } from '../settings/apm_indices/get_apm_indices'; function decodeUiFilters(server: Server, uiFiltersEncoded?: string) { if (!uiFiltersEncoded) { @@ -31,12 +32,17 @@ export async function setupRequest(req: Legacy.Request) { const query = (req.query as unknown) as APMRequestQuery; const { server } = req; const config = server.config(); + const [uiFiltersES, indices] = await Promise.all([ + decodeUiFilters(server, query.uiFilters), + getApmIndices(server) + ]); return { start: moment.utc(query.start).valueOf(), end: moment.utc(query.end).valueOf(), - uiFiltersES: await decodeUiFilters(server, query.uiFilters), + uiFiltersES, client: getESClient(req), - config + config, + indices }; } diff --git a/x-pack/legacy/plugins/apm/server/lib/index_pattern/getKueryBarIndexPattern.ts b/x-pack/legacy/plugins/apm/server/lib/index_pattern/getKueryBarIndexPattern.ts new file mode 100644 index 0000000000000..a5ba4573cfd58 --- /dev/null +++ b/x-pack/legacy/plugins/apm/server/lib/index_pattern/getKueryBarIndexPattern.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 { Legacy } from 'kibana'; +import { StaticIndexPattern } from 'ui/index_patterns'; +import { APICaller } from 'src/core/server'; +import { IndexPatternsFetcher } from '../../../../../../../src/plugins/data/server'; +import { Setup } from '../helpers/setup_request'; + +export const getKueryBarIndexPattern = async ({ + request, + processorEvent, + setup +}: { + request: Legacy.Request; + processorEvent?: 'transaction' | 'error' | 'metric'; + setup: Setup; +}) => { + const { indices } = setup; + + const indexPatternsFetcher = new IndexPatternsFetcher( + (...rest: Parameters) => + request.server.plugins.elasticsearch + .getCluster('data') + .callWithRequest(request, ...rest) + ); + + const indexNames = processorEvent + ? [processorEvent] + : ['transaction' as const, 'metric' as const, 'error' as const]; + + const indicesMap = { + transaction: indices['apm_oss.transactionIndices'], + metric: indices['apm_oss.metricsIndices'], + error: indices['apm_oss.errorIndices'] + }; + + const configuredIndices = indexNames.map(name => indicesMap[name]); + + const fields = await indexPatternsFetcher.getFieldsForWildcard({ + pattern: configuredIndices + }); + + const pattern: StaticIndexPattern = { + fields, + title: configuredIndices.join(',') + }; + + return pattern; +}; diff --git a/x-pack/legacy/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap b/x-pack/legacy/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap index 71217ccc36f7b..acd5dc119b737 100644 --- a/x-pack/legacy/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap +++ b/x-pack/legacy/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap @@ -56,9 +56,7 @@ Object { }, "size": 0, }, - "index": Array [ - "myIndex", - ], + "index": "myIndex", "terminateAfter": 1, } `; @@ -228,8 +226,6 @@ Object { }, "size": 0, }, - "index": Array [ - "myIndex", - ], + "index": "myIndex", } `; diff --git a/x-pack/legacy/plugins/apm/server/lib/services/get_service_agent_name.ts b/x-pack/legacy/plugins/apm/server/lib/services/get_service_agent_name.ts index b39e35a305b19..bbb18eae7eb09 100644 --- a/x-pack/legacy/plugins/apm/server/lib/services/get_service_agent_name.ts +++ b/x-pack/legacy/plugins/apm/server/lib/services/get_service_agent_name.ts @@ -13,14 +13,14 @@ import { rangeFilter } from '../helpers/range_filter'; import { Setup } from '../helpers/setup_request'; export async function getServiceAgentName(serviceName: string, setup: Setup) { - const { start, end, client, config } = setup; + const { start, end, client, indices } = setup; const params = { terminateAfter: 1, index: [ - config.get('apm_oss.errorIndices'), - config.get('apm_oss.transactionIndices'), - config.get('apm_oss.metricsIndices') + indices['apm_oss.errorIndices'], + indices['apm_oss.transactionIndices'], + indices['apm_oss.metricsIndices'] ], body: { size: 0, diff --git a/x-pack/legacy/plugins/apm/server/lib/services/get_service_transaction_types.ts b/x-pack/legacy/plugins/apm/server/lib/services/get_service_transaction_types.ts index 9d651247d5cee..00ffa7484bb48 100644 --- a/x-pack/legacy/plugins/apm/server/lib/services/get_service_transaction_types.ts +++ b/x-pack/legacy/plugins/apm/server/lib/services/get_service_transaction_types.ts @@ -16,10 +16,10 @@ export async function getServiceTransactionTypes( serviceName: string, setup: Setup ) { - const { start, end, client, config } = setup; + const { start, end, client, indices } = setup; const params = { - index: [config.get('apm_oss.transactionIndices')], + index: indices['apm_oss.transactionIndices'], body: { size: 0, query: { diff --git a/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_agent_status.ts b/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_agent_status.ts index f9a7671abd994..6c28d19a14711 100644 --- a/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_agent_status.ts +++ b/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_agent_status.ts @@ -9,15 +9,15 @@ import { Setup } from '../../helpers/setup_request'; // Note: this logic is duplicated in tutorials/apm/envs/on_prem export async function getAgentStatus(setup: Setup) { - const { client, config } = setup; + const { client, indices } = setup; const params = { terminateAfter: 1, index: [ - config.get('apm_oss.errorIndices'), - config.get('apm_oss.metricsIndices'), - config.get('apm_oss.sourcemapIndices'), - config.get('apm_oss.transactionIndices') + indices['apm_oss.errorIndices'], + indices['apm_oss.metricsIndices'], + indices['apm_oss.sourcemapIndices'], + indices['apm_oss.transactionIndices'] ], body: { size: 0, diff --git a/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_legacy_data_status.ts b/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_legacy_data_status.ts index 1379d79326add..5497eaa13d34b 100644 --- a/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_legacy_data_status.ts +++ b/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_legacy_data_status.ts @@ -12,11 +12,11 @@ import { Setup } from '../../helpers/setup_request'; // returns true if 6.x data is found export async function getLegacyDataStatus(setup: Setup) { - const { client, config } = setup; + const { client, indices } = setup; const params = { terminateAfter: 1, - index: [config.get('apm_oss.transactionIndices')], + index: indices['apm_oss.transactionIndices'], body: { size: 0, query: { diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts index 4226c073b1de0..861732ee03923 100644 --- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts +++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts @@ -6,15 +6,15 @@ import { InternalCoreSetup } from 'src/core/server'; import { CallCluster } from '../../../../../../../../src/legacy/core_plugins/elasticsearch'; +import { getApmIndices } from '../apm_indices/get_apm_indices'; export async function createApmAgentConfigurationIndex( core: InternalCoreSetup ) { try { const { server } = core.http; - const index = server - .config() - .get('apm_oss.apmAgentConfigurationIndex'); + const indices = await getApmIndices(server); + const index = indices['apm_oss.apmAgentConfigurationIndex']; const { callWithInternalUser } = server.plugins.elasticsearch.getCluster( 'admin' ); diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/create_or_update_configuration.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/create_or_update_configuration.ts index 9f0d8e2f1c718..25a4f5141498f 100644 --- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/create_or_update_configuration.ts +++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/create_or_update_configuration.ts @@ -21,11 +21,11 @@ export async function createOrUpdateConfiguration({ >; setup: Setup; }) { - const { client, config } = setup; + const { client, indices } = setup; const params: APMIndexDocumentParams = { refresh: true, - index: config.get('apm_oss.apmAgentConfigurationIndex'), + index: indices['apm_oss.apmAgentConfigurationIndex'], body: { agent_name: configuration.agent_name, service: { diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/delete_configuration.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/delete_configuration.ts index 82b192125a5cf..896363c054ba7 100644 --- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/delete_configuration.ts +++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/delete_configuration.ts @@ -13,11 +13,11 @@ export async function deleteConfiguration({ configurationId: string; setup: Setup; }) { - const { client, config } = setup; + const { client, indices } = setup; const params = { refresh: 'wait_for', - index: config.get('apm_oss.apmAgentConfigurationIndex'), + index: indices['apm_oss.apmAgentConfigurationIndex'], id: configurationId }; diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_agent_name_by_service.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_agent_name_by_service.ts index 7742bc938816f..21663b813f01f 100644 --- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_agent_name_by_service.ts +++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_agent_name_by_service.ts @@ -19,14 +19,14 @@ export async function getAgentNameByService({ serviceName: string; setup: Setup; }) { - const { client, config } = setup; + const { client, indices } = setup; const params = { terminateAfter: 1, index: [ - config.get('apm_oss.metricsIndices'), - config.get('apm_oss.errorIndices'), - config.get('apm_oss.transactionIndices') + indices['apm_oss.metricsIndices'], + indices['apm_oss.errorIndices'], + indices['apm_oss.transactionIndices'] ], body: { size: 0, diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_all_environments.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_all_environments.ts index aad31feef000b..8215e2b9fd668 100644 --- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_all_environments.ts +++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_all_environments.ts @@ -20,7 +20,7 @@ export async function getAllEnvironments({ serviceName: string | undefined; setup: Setup; }) { - const { client, config } = setup; + const { client, indices } = setup; // omit filter for service.name if "All" option is selected const serviceNameFilter = serviceName @@ -29,9 +29,9 @@ export async function getAllEnvironments({ const params = { index: [ - config.get('apm_oss.metricsIndices'), - config.get('apm_oss.errorIndices'), - config.get('apm_oss.transactionIndices') + indices['apm_oss.metricsIndices'], + indices['apm_oss.errorIndices'], + indices['apm_oss.transactionIndices'] ], body: { size: 0, diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_existing_environments_for_service.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_existing_environments_for_service.ts index 6b557f21f3457..d5aa389cea335 100644 --- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_existing_environments_for_service.ts +++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_existing_environments_for_service.ts @@ -19,14 +19,14 @@ export async function getExistingEnvironmentsForService({ serviceName: string | undefined; setup: Setup; }) { - const { client, config } = setup; + const { client, indices } = setup; const bool = serviceName ? { filter: [{ term: { [SERVICE_NAME]: serviceName } }] } : { must_not: [{ exists: { field: SERVICE_NAME } }] }; const params = { - index: config.get('apm_oss.apmAgentConfigurationIndex'), + index: indices['apm_oss.apmAgentConfigurationIndex'], body: { size: 0, query: { bool }, diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts index dfc1041c96488..51a4564f53576 100644 --- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts +++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts @@ -17,13 +17,13 @@ export type AgentConfigurationServicesAPIResponse = PromiseReturnType< typeof getServiceNames >; export async function getServiceNames({ setup }: { setup: Setup }) { - const { client, config } = setup; + const { client, indices } = setup; const params = { index: [ - config.get('apm_oss.metricsIndices'), - config.get('apm_oss.errorIndices'), - config.get('apm_oss.transactionIndices') + indices['apm_oss.metricsIndices'], + indices['apm_oss.errorIndices'], + indices['apm_oss.transactionIndices'] ], body: { size: 0, diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/list_configurations.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/list_configurations.ts index 9edceb86dda8d..283f30b51441d 100644 --- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/list_configurations.ts +++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/list_configurations.ts @@ -12,10 +12,10 @@ export type AgentConfigurationListAPIResponse = PromiseReturnType< typeof listConfigurations >; export async function listConfigurations({ setup }: { setup: Setup }) { - const { client, config } = setup; + const { client, indices } = setup; const params = { - index: config.get('apm_oss.apmAgentConfigurationIndex') + index: indices['apm_oss.apmAgentConfigurationIndex'] }; const resp = await client.search(params); diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/mark_applied_by_agent.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/mark_applied_by_agent.ts index 867045142cea0..e5349edb67f30 100644 --- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/mark_applied_by_agent.ts +++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/mark_applied_by_agent.ts @@ -16,10 +16,10 @@ export async function markAppliedByAgent({ body: AgentConfiguration; setup: Setup; }) { - const { client, config } = setup; + const { client, indices } = setup; const params = { - index: config.get('apm_oss.apmAgentConfigurationIndex'), + index: indices['apm_oss.apmAgentConfigurationIndex'], id, // by specifying the `id` elasticsearch will do an "upsert" body: { ...body, diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.test.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.test.ts index e8db37891e7ae..400bd0207771a 100644 --- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.test.ts +++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.test.ts @@ -15,7 +15,18 @@ describe('search configurations', () => { environment: 'production', setup: ({ config: { get: () => '' }, - client: { search: async () => searchMocks } + client: { search: async () => searchMocks }, + indices: { + apm_oss: { + sourcemapIndices: 'myIndex', + errorIndices: 'myIndex', + onboardingIndices: 'myIndex', + spanIndices: 'myIndex', + transactionIndices: 'myIndex', + metricsIndices: 'myIndex', + apmAgentConfigurationIndex: 'myIndex' + } + } } as unknown) as Setup }); @@ -29,7 +40,18 @@ describe('search configurations', () => { environment: 'production', setup: ({ config: { get: () => '' }, - client: { search: async () => searchMocks } + client: { search: async () => searchMocks }, + indices: { + apm_oss: { + sourcemapIndices: 'myIndex', + errorIndices: 'myIndex', + onboardingIndices: 'myIndex', + spanIndices: 'myIndex', + transactionIndices: 'myIndex', + metricsIndices: 'myIndex', + apmAgentConfigurationIndex: 'myIndex' + } + } } as unknown) as Setup }); diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.ts index 6b0dc370dd878..35d76d745cf4f 100644 --- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.ts +++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.ts @@ -20,7 +20,7 @@ export async function searchConfigurations({ environment?: string; setup: Setup; }) { - const { client, config } = setup; + const { client, indices } = setup; // sorting order // 1. exact match: service.name AND service.environment (eg. opbeans-node / production) @@ -33,7 +33,7 @@ export async function searchConfigurations({ : []; const params = { - index: config.get('apm_oss.apmAgentConfigurationIndex'), + index: indices['apm_oss.apmAgentConfigurationIndex'], body: { query: { bool: { diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts b/x-pack/legacy/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts new file mode 100644 index 0000000000000..cd237a5264099 --- /dev/null +++ b/x-pack/legacy/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.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 { Server } from 'hapi'; +import { merge } from 'lodash'; +import { KibanaConfig } from 'src/legacy/server/kbn_server'; +import { getSavedObjectsClient } from '../../helpers/saved_objects_client'; +import { Setup } from '../../helpers/setup_request'; +import { PromiseReturnType } from '../../../../typings/common'; + +export interface ApmIndicesConfig { + 'apm_oss.sourcemapIndices': string; + 'apm_oss.errorIndices': string; + 'apm_oss.onboardingIndices': string; + 'apm_oss.spanIndices': string; + 'apm_oss.transactionIndices': string; + 'apm_oss.metricsIndices': string; + 'apm_oss.apmAgentConfigurationIndex': string; +} + +export type ApmIndicesName = keyof ApmIndicesConfig; + +export const APM_INDICES_SAVED_OBJECT_TYPE = 'apm-indices'; +export const APM_INDICES_SAVED_OBJECT_ID = 'apm-indices'; + +async function getApmIndicesSavedObject(server: Server) { + const savedObjectsClient = getSavedObjectsClient(server, 'data'); + const apmIndices = await savedObjectsClient.get>( + APM_INDICES_SAVED_OBJECT_TYPE, + APM_INDICES_SAVED_OBJECT_ID + ); + return apmIndices.attributes; +} + +function getApmIndicesConfig(config: KibanaConfig): ApmIndicesConfig { + return { + 'apm_oss.sourcemapIndices': config.get('apm_oss.sourcemapIndices'), + 'apm_oss.errorIndices': config.get('apm_oss.errorIndices'), + 'apm_oss.onboardingIndices': config.get( + 'apm_oss.onboardingIndices' + ), + 'apm_oss.spanIndices': config.get('apm_oss.spanIndices'), + 'apm_oss.transactionIndices': config.get( + 'apm_oss.transactionIndices' + ), + 'apm_oss.metricsIndices': config.get('apm_oss.metricsIndices'), + 'apm_oss.apmAgentConfigurationIndex': config.get( + 'apm_oss.apmAgentConfigurationIndex' + ) + }; +} + +export async function getApmIndices(server: Server) { + try { + const apmIndicesSavedObject = await getApmIndicesSavedObject(server); + const apmIndicesConfig = getApmIndicesConfig(server.config()); + return merge({}, apmIndicesConfig, apmIndicesSavedObject); + } catch (error) { + return getApmIndicesConfig(server.config()); + } +} + +const APM_UI_INDICES: ApmIndicesName[] = [ + 'apm_oss.sourcemapIndices', + 'apm_oss.errorIndices', + 'apm_oss.onboardingIndices', + 'apm_oss.spanIndices', + 'apm_oss.transactionIndices', + 'apm_oss.metricsIndices', + 'apm_oss.apmAgentConfigurationIndex' +]; + +export async function getApmIndexSettings({ + setup, + server +}: { + setup: Setup; + server: Server; +}) { + const { config } = setup; + let apmIndicesSavedObject: PromiseReturnType; + try { + apmIndicesSavedObject = await getApmIndicesSavedObject(server); + } catch (error) { + if (error.output && error.output.statusCode === 404) { + apmIndicesSavedObject = {}; + } else { + throw error; + } + } + const apmIndicesConfig = getApmIndicesConfig(config); + + return APM_UI_INDICES.map(configurationName => ({ + configurationName, + defaultValue: apmIndicesConfig[configurationName], // value defined in kibana[.dev].yml + savedValue: apmIndicesSavedObject[configurationName] // value saved via Saved Objects service + })); +} diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/apm_indices/save_apm_indices.ts b/x-pack/legacy/plugins/apm/server/lib/settings/apm_indices/save_apm_indices.ts new file mode 100644 index 0000000000000..8de47c5c44144 --- /dev/null +++ b/x-pack/legacy/plugins/apm/server/lib/settings/apm_indices/save_apm_indices.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 { Server } from 'hapi'; +import { getSavedObjectsClient } from '../../helpers/saved_objects_client'; +import { + ApmIndicesConfig, + APM_INDICES_SAVED_OBJECT_TYPE, + APM_INDICES_SAVED_OBJECT_ID +} from './get_apm_indices'; + +export async function saveApmIndices( + server: Server, + apmIndicesSavedObject: Partial +) { + const savedObjectsClient = getSavedObjectsClient(server, 'data'); + return await savedObjectsClient.create( + APM_INDICES_SAVED_OBJECT_TYPE, + apmIndicesSavedObject, + { + id: APM_INDICES_SAVED_OBJECT_ID, + overwrite: true + } + ); +} diff --git a/x-pack/legacy/plugins/apm/server/lib/traces/get_trace_items.ts b/x-pack/legacy/plugins/apm/server/lib/traces/get_trace_items.ts index 71b65982db9f0..0df5cc016431d 100644 --- a/x-pack/legacy/plugins/apm/server/lib/traces/get_trace_items.ts +++ b/x-pack/legacy/plugins/apm/server/lib/traces/get_trace_items.ts @@ -17,13 +17,13 @@ import { rangeFilter } from '../helpers/range_filter'; import { Setup } from '../helpers/setup_request'; export async function getTraceItems(traceId: string, setup: Setup) { - const { start, end, client, config } = setup; + const { start, end, client, config, indices } = setup; const maxTraceItems = config.get('xpack.apm.ui.maxTraceItems'); const params = { index: [ - config.get('apm_oss.spanIndices'), - config.get('apm_oss.transactionIndices') + indices['apm_oss.spanIndices'], + indices['apm_oss.transactionIndices'] ], body: { size: maxTraceItems, diff --git a/x-pack/legacy/plugins/apm/server/lib/transaction_groups/fetcher.test.ts b/x-pack/legacy/plugins/apm/server/lib/transaction_groups/fetcher.test.ts index fc7b1b4127892..99553690359cf 100644 --- a/x-pack/legacy/plugins/apm/server/lib/transaction_groups/fetcher.test.ts +++ b/x-pack/legacy/plugins/apm/server/lib/transaction_groups/fetcher.test.ts @@ -16,15 +16,22 @@ function getSetup() { config: { get: jest.fn((key: string) => { switch (key) { - case 'apm_oss.transactionIndices': - return 'myIndex'; case 'xpack.apm.ui.transactionGroupBucketSize': return 100; } }), has: () => true }, - uiFiltersES: [{ term: { 'service.environment': 'test' } }] + uiFiltersES: [{ term: { 'service.environment': 'test' } }], + indices: { + 'apm_oss.sourcemapIndices': 'myIndex', + 'apm_oss.errorIndices': 'myIndex', + 'apm_oss.onboardingIndices': 'myIndex', + 'apm_oss.spanIndices': 'myIndex', + 'apm_oss.transactionIndices': 'myIndex', + 'apm_oss.metricsIndices': 'myIndex', + 'apm_oss.apmAgentConfigurationIndex': 'myIndex' + } }; } diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/avg_duration_by_country/index.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/avg_duration_by_country/index.ts index e2989498181ca..e092942a25ba6 100644 --- a/x-pack/legacy/plugins/apm/server/lib/transactions/avg_duration_by_country/index.ts +++ b/x-pack/legacy/plugins/apm/server/lib/transactions/avg_duration_by_country/index.ts @@ -21,9 +21,9 @@ export async function getTransactionAvgDurationByCountry({ setup: Setup; serviceName: string; }) { - const { uiFiltersES, client, config, start, end } = setup; + const { uiFiltersES, client, start, end, indices } = setup; const params = { - index: config.get('apm_oss.transactionIndices'), + index: indices['apm_oss.transactionIndices'], body: { size: 0, query: { diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.test.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.test.ts index e707ce3eafe18..67816d67a29a2 100644 --- a/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.test.ts +++ b/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.test.ts @@ -9,6 +9,16 @@ import * as constants from './constants'; import noDataResponse from './mock-responses/noData.json'; import dataResponse from './mock-responses/data.json'; +const mockIndices = { + 'apm_oss.sourcemapIndices': 'myIndex', + 'apm_oss.errorIndices': 'myIndex', + 'apm_oss.onboardingIndices': 'myIndex', + 'apm_oss.spanIndices': 'myIndex', + 'apm_oss.transactionIndices': 'myIndex', + 'apm_oss.metricsIndices': 'myIndex', + 'apm_oss.apmAgentConfigurationIndex': 'myIndex' +}; + describe('getTransactionBreakdown', () => { it('returns an empty array if no data is available', async () => { const clientSpy = jest.fn().mockReturnValueOnce(noDataResponse); @@ -24,7 +34,8 @@ describe('getTransactionBreakdown', () => { get: () => 'myIndex' as any, has: () => true }, - uiFiltersES: [] + uiFiltersES: [], + indices: mockIndices } }); @@ -47,7 +58,8 @@ describe('getTransactionBreakdown', () => { get: () => 'myIndex' as any, has: () => true }, - uiFiltersES: [] + uiFiltersES: [], + indices: mockIndices } }); @@ -87,7 +99,8 @@ describe('getTransactionBreakdown', () => { get: () => 'myIndex' as any, has: () => true }, - uiFiltersES: [] + uiFiltersES: [], + indices: mockIndices } }); @@ -126,7 +139,8 @@ describe('getTransactionBreakdown', () => { get: () => 'myIndex' as any, has: () => true }, - uiFiltersES: [] + uiFiltersES: [], + indices: mockIndices } }); @@ -149,7 +163,8 @@ describe('getTransactionBreakdown', () => { get: () => 'myIndex' as any, has: () => true }, - uiFiltersES: [] + uiFiltersES: [], + indices: mockIndices } }); diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.ts index ecf963fec3fe9..a21c4f38ac30c 100644 --- a/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.ts +++ b/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.ts @@ -32,7 +32,7 @@ export async function getTransactionBreakdown({ transactionName?: string; transactionType: string; }) { - const { uiFiltersES, client, config, start, end } = setup; + const { uiFiltersES, client, start, end, indices } = setup; const subAggs = { sum_all_self_times: { @@ -88,7 +88,7 @@ export async function getTransactionBreakdown({ } const params = { - index: config.get('apm_oss.metricsIndices'), + index: indices['apm_oss.metricsIndices'], body: { size: 0, query: { diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.test.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.test.ts index 07f1d96618198..cddc66e52cf70 100644 --- a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.test.ts +++ b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.test.ts @@ -30,7 +30,16 @@ describe('getAnomalySeries', () => { get: () => 'myIndex' as any, has: () => true }, - uiFiltersES: [] + uiFiltersES: [], + indices: { + 'apm_oss.sourcemapIndices': 'myIndex', + 'apm_oss.errorIndices': 'myIndex', + 'apm_oss.onboardingIndices': 'myIndex', + 'apm_oss.spanIndices': 'myIndex', + 'apm_oss.transactionIndices': 'myIndex', + 'apm_oss.metricsIndices': 'myIndex', + 'apm_oss.apmAgentConfigurationIndex': 'myIndex' + } } }); }); diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.test.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.test.ts index dc568d653a5ee..5056a100de3ce 100644 --- a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.test.ts +++ b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.test.ts @@ -29,7 +29,16 @@ describe('timeseriesFetcher', () => { { term: { 'service.environment': 'test' } } - ] + ], + indices: { + 'apm_oss.sourcemapIndices': 'myIndex', + 'apm_oss.errorIndices': 'myIndex', + 'apm_oss.onboardingIndices': 'myIndex', + 'apm_oss.spanIndices': 'myIndex', + 'apm_oss.transactionIndices': 'myIndex', + 'apm_oss.metricsIndices': 'myIndex', + 'apm_oss.apmAgentConfigurationIndex': 'myIndex' + } } }); }); diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts index 97368b7d92efc..0d9cccb3b56d3 100644 --- a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts +++ b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts @@ -30,7 +30,7 @@ export function timeseriesFetcher({ transactionName: string | undefined; setup: Setup; }) { - const { start, end, uiFiltersES, client, config } = setup; + const { start, end, uiFiltersES, client, indices } = setup; const { intervalString } = getBucketSize(start, end, 'auto'); const filter: ESFilter[] = [ @@ -50,7 +50,7 @@ export function timeseriesFetcher({ } const params = { - index: config.get('apm_oss.transactionIndices'), + index: indices['apm_oss.transactionIndices'], body: { size: 0, query: { bool: { filter } }, diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/distribution/get_buckets/fetcher.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/distribution/get_buckets/fetcher.ts index 42b35402aab9d..90d9a925a1f36 100644 --- a/x-pack/legacy/plugins/apm/server/lib/transactions/distribution/get_buckets/fetcher.ts +++ b/x-pack/legacy/plugins/apm/server/lib/transactions/distribution/get_buckets/fetcher.ts @@ -28,10 +28,10 @@ export async function bucketFetcher( bucketSize: number, setup: Setup ) { - const { start, end, uiFiltersES, client, config } = setup; + const { start, end, uiFiltersES, client, indices } = setup; const params = { - index: config.get('apm_oss.transactionIndices'), + index: indices['apm_oss.transactionIndices'], body: { size: 0, query: { diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts index f49cf2b8c8541..a54fa9c10de13 100644 --- a/x-pack/legacy/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts +++ b/x-pack/legacy/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts @@ -19,10 +19,10 @@ export async function getDistributionMax( transactionType: string, setup: Setup ) { - const { start, end, uiFiltersES, client, config } = setup; + const { start, end, uiFiltersES, client, indices } = setup; const params = { - index: config.get('apm_oss.transactionIndices'), + index: indices['apm_oss.transactionIndices'], body: { size: 0, query: { diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/get_transaction/index.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/get_transaction/index.ts index cdaddc3af3e95..20152ecf06480 100644 --- a/x-pack/legacy/plugins/apm/server/lib/transactions/get_transaction/index.ts +++ b/x-pack/legacy/plugins/apm/server/lib/transactions/get_transaction/index.ts @@ -19,10 +19,10 @@ export async function getTransaction( traceId: string, setup: Setup ) { - const { start, end, uiFiltersES, client, config } = setup; + const { start, end, uiFiltersES, client, indices } = setup; const params = { - index: config.get('apm_oss.transactionIndices'), + index: indices['apm_oss.transactionIndices'], body: { size: 1, query: { diff --git a/x-pack/legacy/plugins/apm/server/lib/ui_filters/get_environments.ts b/x-pack/legacy/plugins/apm/server/lib/ui_filters/get_environments.ts index 80795ce468c88..ade491be32fc7 100644 --- a/x-pack/legacy/plugins/apm/server/lib/ui_filters/get_environments.ts +++ b/x-pack/legacy/plugins/apm/server/lib/ui_filters/get_environments.ts @@ -16,7 +16,7 @@ import { ENVIRONMENT_NOT_DEFINED } from '../../../common/environment_filter_valu import { ESFilter } from '../../../typings/elasticsearch'; export async function getEnvironments(setup: Setup, serviceName?: string) { - const { start, end, client, config } = setup; + const { start, end, client, indices } = setup; const filter: ESFilter[] = [ { terms: { [PROCESSOR_EVENT]: ['transaction', 'error', 'metric'] } }, @@ -31,9 +31,9 @@ export async function getEnvironments(setup: Setup, serviceName?: string) { const params = { index: [ - config.get('apm_oss.metricsIndices'), - config.get('apm_oss.errorIndices'), - config.get('apm_oss.transactionIndices') + indices['apm_oss.metricsIndices'], + indices['apm_oss.errorIndices'], + indices['apm_oss.transactionIndices'] ], body: { size: 0, diff --git a/x-pack/legacy/plugins/apm/server/routes/create_apm_api.ts b/x-pack/legacy/plugins/apm/server/routes/create_apm_api.ts index 682ebf27207c4..7d22d9488718f 100644 --- a/x-pack/legacy/plugins/apm/server/routes/create_apm_api.ts +++ b/x-pack/legacy/plugins/apm/server/routes/create_apm_api.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { indexPatternRoute } from './index_pattern'; +import { indexPatternRoute, kueryBarIndexPatternRoute } from './index_pattern'; import { errorDistributionRoute, errorGroupsRoute, @@ -25,7 +25,12 @@ import { listAgentConfigurationServicesRoute, updateAgentConfigurationRoute, agentConfigurationAgentNameRoute -} from './settings'; +} from './settings/agent_configuration'; +import { + apmIndexSettingsRoute, + apmIndicesRoute, + saveApmIndicesRoute +} from './settings/apm_indices'; import { metricsChartsRoute } from './metrics'; import { serviceNodesRoute } from './service_nodes'; import { tracesRoute, tracesByIdRoute } from './traces'; @@ -53,6 +58,7 @@ const createApmApi = () => { const api = createApi() // index pattern .add(indexPatternRoute) + .add(kueryBarIndexPatternRoute) // Errors .add(errorDistributionRoute) @@ -75,6 +81,11 @@ const createApmApi = () => { .add(listAgentConfigurationServicesRoute) .add(updateAgentConfigurationRoute) + // APM indices + .add(apmIndexSettingsRoute) + .add(apmIndicesRoute) + .add(saveApmIndicesRoute) + // Metrics .add(metricsChartsRoute) .add(serviceNodesRoute) diff --git a/x-pack/legacy/plugins/apm/server/routes/index_pattern.ts b/x-pack/legacy/plugins/apm/server/routes/index_pattern.ts index e838fb1a4b526..100df4dc238fe 100644 --- a/x-pack/legacy/plugins/apm/server/routes/index_pattern.ts +++ b/x-pack/legacy/plugins/apm/server/routes/index_pattern.ts @@ -3,8 +3,11 @@ * 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 t from 'io-ts'; import { getAPMIndexPattern } from '../lib/index_pattern'; import { createRoute } from './create_route'; +import { getKueryBarIndexPattern } from '../lib/index_pattern/getKueryBarIndexPattern'; +import { setupRequest } from '../lib/helpers/setup_request'; export const indexPatternRoute = createRoute(core => ({ path: '/api/apm/index_pattern', @@ -13,3 +16,23 @@ export const indexPatternRoute = createRoute(core => ({ return await getAPMIndexPattern(server); } })); + +export const kueryBarIndexPatternRoute = createRoute(core => ({ + path: '/api/apm/kuery_bar_index_pattern', + params: { + query: t.partial({ + processorEvent: t.union([ + t.literal('transaction'), + t.literal('metric'), + t.literal('error') + ]) + }) + }, + handler: async (request, { query }) => { + const { processorEvent } = query; + + const setup = await setupRequest(request); + + return getKueryBarIndexPattern({ request, processorEvent, setup }); + } +})); diff --git a/x-pack/legacy/plugins/apm/server/routes/settings.ts b/x-pack/legacy/plugins/apm/server/routes/settings/agent_configuration.ts similarity index 80% rename from x-pack/legacy/plugins/apm/server/routes/settings.ts rename to x-pack/legacy/plugins/apm/server/routes/settings/agent_configuration.ts index 65ef5df78f3e1..d25ad949d6dde 100644 --- a/x-pack/legacy/plugins/apm/server/routes/settings.ts +++ b/x-pack/legacy/plugins/apm/server/routes/settings/agent_configuration.ts @@ -5,18 +5,18 @@ */ import * as t from 'io-ts'; -import { setupRequest } from '../lib/helpers/setup_request'; -import { getServiceNames } from '../lib/settings/agent_configuration/get_service_names'; -import { createOrUpdateConfiguration } from '../lib/settings/agent_configuration/create_or_update_configuration'; -import { searchConfigurations } from '../lib/settings/agent_configuration/search'; -import { listConfigurations } from '../lib/settings/agent_configuration/list_configurations'; -import { getEnvironments } from '../lib/settings/agent_configuration/get_environments'; -import { deleteConfiguration } from '../lib/settings/agent_configuration/delete_configuration'; -import { createRoute } from './create_route'; -import { transactionSampleRateRt } from '../../common/runtime_types/transaction_sample_rate_rt'; -import { transactionMaxSpansRt } from '../../common/runtime_types/transaction_max_spans_rt'; -import { getAgentNameByService } from '../lib/settings/agent_configuration/get_agent_name_by_service'; -import { markAppliedByAgent } from '../lib/settings/agent_configuration/mark_applied_by_agent'; +import { setupRequest } from '../../lib/helpers/setup_request'; +import { getServiceNames } from '../../lib/settings/agent_configuration/get_service_names'; +import { createOrUpdateConfiguration } from '../../lib/settings/agent_configuration/create_or_update_configuration'; +import { searchConfigurations } from '../../lib/settings/agent_configuration/search'; +import { listConfigurations } from '../../lib/settings/agent_configuration/list_configurations'; +import { getEnvironments } from '../../lib/settings/agent_configuration/get_environments'; +import { deleteConfiguration } from '../../lib/settings/agent_configuration/delete_configuration'; +import { createRoute } from '../create_route'; +import { transactionSampleRateRt } from '../../../common/runtime_types/transaction_sample_rate_rt'; +import { transactionMaxSpansRt } from '../../../common/runtime_types/transaction_max_spans_rt'; +import { getAgentNameByService } from '../../lib/settings/agent_configuration/get_agent_name_by_service'; +import { markAppliedByAgent } from '../../lib/settings/agent_configuration/mark_applied_by_agent'; // get list of configurations export const agentConfigurationRoute = createRoute(core => ({ diff --git a/x-pack/legacy/plugins/apm/server/routes/settings/apm_indices.ts b/x-pack/legacy/plugins/apm/server/routes/settings/apm_indices.ts new file mode 100644 index 0000000000000..3c82a35ec7903 --- /dev/null +++ b/x-pack/legacy/plugins/apm/server/routes/settings/apm_indices.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 * as t from 'io-ts'; +import { setupRequest } from '../../lib/helpers/setup_request'; +import { createRoute } from '../create_route'; +import { + getApmIndices, + getApmIndexSettings +} from '../../lib/settings/apm_indices/get_apm_indices'; +import { saveApmIndices } from '../../lib/settings/apm_indices/save_apm_indices'; + +// get list of apm indices and values +export const apmIndexSettingsRoute = createRoute(core => ({ + method: 'GET', + path: '/api/apm/settings/apm-index-settings', + handler: async req => { + const { server } = core.http; + const setup = await setupRequest(req); + return await getApmIndexSettings({ setup, server }); + } +})); + +// get apm indices configuration object +export const apmIndicesRoute = createRoute(core => ({ + method: 'GET', + path: '/api/apm/settings/apm-indices', + handler: async req => { + const { server } = core.http; + return await getApmIndices(server); + } +})); + +// save ui indices +export const saveApmIndicesRoute = createRoute(core => ({ + method: 'POST', + path: '/api/apm/settings/apm-indices/save', + params: { + body: t.partial({ + 'apm_oss.sourcemapIndices': t.string, + 'apm_oss.errorIndices': t.string, + 'apm_oss.onboardingIndices': t.string, + 'apm_oss.spanIndices': t.string, + 'apm_oss.transactionIndices': t.string, + 'apm_oss.metricsIndices': t.string, + 'apm_oss.apmAgentConfigurationIndex': t.string + }) + }, + handler: async (req, { body }) => { + const { server } = core.http; + return await saveApmIndices(server, body); + } +})); diff --git a/x-pack/legacy/plugins/apm/typings/common.ts b/x-pack/legacy/plugins/apm/typings/common.ts index cfe6c9c572dc4..2fafceb32209c 100644 --- a/x-pack/legacy/plugins/apm/typings/common.ts +++ b/x-pack/legacy/plugins/apm/typings/common.ts @@ -4,10 +4,6 @@ * you may not use this file except in compliance with the Elastic License. */ -export interface StringMap { - [key: string]: T; -} - // Allow unknown properties in an object export type AllowUnknownProperties = T extends Array ? Array> @@ -24,9 +20,3 @@ export type PromiseReturnType = Func extends ( ) => Promise ? Value : Func; - -export type IndexAsString = { - [k: string]: Map[keyof Map]; -} & Map; - -export type Omit = Pick>; diff --git a/x-pack/legacy/plugins/apm/typings/elasticsearch/index.ts b/x-pack/legacy/plugins/apm/typings/elasticsearch/index.ts index 657968fbd704f..56cd0ff23a3fb 100644 --- a/x-pack/legacy/plugins/apm/typings/elasticsearch/index.ts +++ b/x-pack/legacy/plugins/apm/typings/elasticsearch/index.ts @@ -4,10 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ -import { Omit } from 'utility-types'; import { SearchParams, SearchResponse } from 'elasticsearch'; import { AggregationResponseMap, AggregationInputMap } from './aggregations'; -import { StringMap } from '../common'; export interface ESSearchBody { query?: any; @@ -55,6 +53,11 @@ export type ESSearchResponse< export interface ESFilter { [key: string]: { - [key: string]: string | string[] | number | StringMap | ESFilter[]; + [key: string]: + | string + | string[] + | number + | Record + | ESFilter[]; }; } diff --git a/x-pack/legacy/plugins/apm/typings/es_schemas/raw/ErrorRaw.ts b/x-pack/legacy/plugins/apm/typings/es_schemas/raw/ErrorRaw.ts index 545bcc86b2f95..2f6e857e82470 100644 --- a/x-pack/legacy/plugins/apm/typings/es_schemas/raw/ErrorRaw.ts +++ b/x-pack/legacy/plugins/apm/typings/es_schemas/raw/ErrorRaw.ts @@ -21,7 +21,7 @@ interface Processor { event: 'error'; } -interface Exception { +export interface Exception { message?: string; // either message or type are given type?: string; module?: string; diff --git a/x-pack/legacy/plugins/beats_management/public/components/autocomplete_field/suggestion_item.tsx b/x-pack/legacy/plugins/beats_management/public/components/autocomplete_field/suggestion_item.tsx index 64e7bf6b7f09e..2ae475475829f 100644 --- a/x-pack/legacy/plugins/beats_management/public/components/autocomplete_field/suggestion_item.tsx +++ b/x-pack/legacy/plugins/beats_management/public/components/autocomplete_field/suggestion_item.tsx @@ -18,29 +18,23 @@ interface SuggestionItemProps { suggestion: AutocompleteSuggestion; } -export class SuggestionItem extends React.Component { - public static defaultProps: Partial = { - isSelected: false, - }; +export const SuggestionItem: React.SFC = props => { + const { isSelected, onClick, onMouseEnter, suggestion } = props; - public render() { - const { isSelected, onClick, onMouseEnter, suggestion } = this.props; + return ( + + + + + {suggestion.text} + {suggestion.description} + + ); +}; - return ( - - - - - {suggestion.text} - {suggestion.description} - - ); - } -} +SuggestionItem.defaultProps = { + isSelected: false, +}; const SuggestionItemContainer = styled.div<{ isSelected?: boolean; diff --git a/x-pack/legacy/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts b/x-pack/legacy/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts index d4a42ba662db4..526728bd77cac 100644 --- a/x-pack/legacy/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts +++ b/x-pack/legacy/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts @@ -7,16 +7,16 @@ import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query'; import { isEmpty } from 'lodash'; import { npStart } from 'ui/new_platform'; -import { RestAPIAdapter } from '../rest_api/adapter_types'; import { ElasticsearchAdapter } from './adapter_types'; import { AutocompleteSuggestion } from '../../../../../../../../src/plugins/data/public'; +import { setup as data } from '../../../../../../../../src/legacy/core_plugins/data/public/legacy'; const getAutocompleteProvider = (language: string) => npStart.plugins.data.autocomplete.getProvider(language); export class RestElasticsearchAdapter implements ElasticsearchAdapter { private cachedIndexPattern: any = null; - constructor(private readonly api: RestAPIAdapter, private readonly indexPatternName: string) {} + constructor(private readonly indexPatternName: string) {} public isKueryValid(kuery: string): boolean { try { @@ -65,9 +65,9 @@ export class RestElasticsearchAdapter implements ElasticsearchAdapter { if (this.cachedIndexPattern) { return this.cachedIndexPattern; } - const res = await this.api.get( - `/api/index_patterns/_fields_for_wildcard?pattern=${this.indexPatternName}` - ); + const res = await data.indexPatterns.indexPatterns.getFieldsForWildcard({ + pattern: this.indexPatternName, + }); if (isEmpty(res.fields)) { return; } diff --git a/x-pack/legacy/plugins/beats_management/public/lib/compose/kibana.ts b/x-pack/legacy/plugins/beats_management/public/lib/compose/kibana.ts index 3d8ca51e006bf..2ebda89ba13fd 100644 --- a/x-pack/legacy/plugins/beats_management/public/lib/compose/kibana.ts +++ b/x-pack/legacy/plugins/beats_management/public/lib/compose/kibana.ts @@ -35,7 +35,7 @@ const onKibanaReady = chrome.dangerouslyGetActiveInjector; export function compose(): FrontendLibs { const api = new AxiosRestAPIAdapter(chrome.getXsrfToken(), chrome.getBasePath()); - const esAdapter = new RestElasticsearchAdapter(api, INDEX_NAMES.BEATS); + const esAdapter = new RestElasticsearchAdapter(INDEX_NAMES.BEATS); const elasticsearchLib = new ElasticsearchLib(esAdapter); const configBlocks = new ConfigBlocksLib( new RestConfigBlocksAdapter(api), diff --git a/x-pack/legacy/plugins/beats_management/public/pages/walkthrough/initial/index.tsx b/x-pack/legacy/plugins/beats_management/public/pages/walkthrough/initial/index.tsx index 6ac6643755765..26f2aa80de763 100644 --- a/x-pack/legacy/plugins/beats_management/public/pages/walkthrough/initial/index.tsx +++ b/x-pack/legacy/plugins/beats_management/public/pages/walkthrough/initial/index.tsx @@ -6,93 +6,90 @@ import { EuiBetaBadge, EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react'; -import React, { Component } from 'react'; +import React from 'react'; import { NoDataLayout } from '../../../components/layouts/no_data'; import { WalkthroughLayout } from '../../../components/layouts/walkthrough'; import { ChildRoutes } from '../../../components/navigation/child_routes'; import { ConnectedLink } from '../../../components/navigation/connected_link'; import { AppPageProps } from '../../../frontend_types'; -class InitialWalkthroughPageComponent extends Component< - AppPageProps & { - intl: InjectedIntl; - } -> { - public render() { - const { intl } = this.props; +type Props = AppPageProps & { + intl: InjectedIntl; +}; - if (this.props.location.pathname === '/walkthrough/initial') { - return ( - - {'Beats central management '} - - - - - } - actionSection={ - - - {' '} - - - } - > -

- -

- - ); - } +const InitialWalkthroughPageComponent: React.SFC = props => { + if (props.location.pathname === '/walkthrough/initial') { return ( - { - // FIXME implament goto - }} - activePath={this.props.location.pathname} + + {'Beats central management '} + + + + + } + actionSection={ + + + {' '} + + + } > - - +

+ +

+ ); } -} + return ( + { + // FIXME implament goto + }} + activePath={props.location.pathname} + > + + + ); +}; + export const InitialWalkthroughPage = injectI18n(InitialWalkthroughPageComponent); diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts index cad46e81ffc0c..063e69d1d2141 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts +++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { ExpressionType } from 'src/plugins/expressions/common'; +import { ExpressionType } from 'src/plugins/expressions/public'; import { EmbeddableInput } from 'src/legacy/core_plugins/embeddable_api/public/np_ready/public'; import { EmbeddableTypes } from './embeddable_types'; diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts index 6efe6bc96dbba..546e8967a7439 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts +++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts @@ -6,7 +6,7 @@ // @ts-ignore import { MAP_SAVED_OBJECT_TYPE } from '../../../maps/common/constants'; -import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/visualize/embeddable'; +import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/visualize/embeddable/constants'; import { SEARCH_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/discover/embeddable/constants'; export const EmbeddableTypes = { diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts index 958d9c6a3a6f0..abaa16c4e3271 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts +++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts @@ -3,7 +3,6 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { Filter as ESFilterType } from '@kbn/es-query'; import { ExpressionFunction } from 'src/legacy/core_plugins/interpreter/public'; import { TimeRange } from 'src/plugins/data/public'; import { EmbeddableInput } from 'src/legacy/core_plugins/embeddable_api/public/np_ready/public'; @@ -15,6 +14,7 @@ import { EmbeddableExpression, } from '../../expression_types'; import { getFunctionHelp } from '../../../i18n'; +import { esFilters } from '../../../../../../../src/plugins/data/public'; interface Arguments { id: string; @@ -29,7 +29,7 @@ interface SavedMapInput extends EmbeddableInput { isPaused: boolean; interval: number; }; - filters: ESFilterType[]; + filters: esFilters.Filter[]; } type Return = EmbeddableExpression; diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/flyout/snippets_step.tsx b/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/flyout/snippets_step.tsx index f933d9009d367..a65ec1ddba081 100644 --- a/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/flyout/snippets_step.tsx +++ b/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/flyout/snippets_step.tsx @@ -58,7 +58,7 @@ export const SnippetsStep: FC<{ onCopy: OnCopyFn }> = ({ onCopy }) => ( - kbn-canvas-shareable="canvas" ({strings.getRequiredLabel()}) + kbn-canvas-shareable="canvas" ({strings.getRequiredLabel()}) {strings.getShareableParameterDescription()} diff --git a/x-pack/legacy/plugins/canvas/public/lib/clipboard.js b/x-pack/legacy/plugins/canvas/public/lib/clipboard.js index 2cebf2a5bad96..f9d68769c9c3a 100644 --- a/x-pack/legacy/plugins/canvas/public/lib/clipboard.js +++ b/x-pack/legacy/plugins/canvas/public/lib/clipboard.js @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { Storage } from 'ui/storage'; +import { Storage } from '../../../../../../src/plugins/kibana_utils/public'; import { LOCALSTORAGE_CLIPBOARD } from '../../common/lib/constants'; import { getWindow } from './get_window'; diff --git a/x-pack/legacy/plugins/canvas/scripts/shareable_runtime.js b/x-pack/legacy/plugins/canvas/scripts/shareable_runtime.js index 760298c8a2dff..f867e4dc77a11 100644 --- a/x-pack/legacy/plugins/canvas/scripts/shareable_runtime.js +++ b/x-pack/legacy/plugins/canvas/scripts/shareable_runtime.js @@ -91,10 +91,20 @@ run( clean(); log.info('Building Canvas Shareable Workpad Runtime...'); - execa.sync('yarn', ['webpack', '--config', webpackConfig, '--hide-modules', '--progress'], { - ...options, - env, - }); + execa.sync( + 'yarn', + [ + 'webpack', + '--config', + webpackConfig, + '--hide-modules', + ...(process.stdout.isTTY ? ['--progress'] : []), + ], + { + ...options, + env, + } + ); log.success('...runtime built!'); }, { diff --git a/x-pack/legacy/plugins/canvas/server/lib/build_embeddable_filters.ts b/x-pack/legacy/plugins/canvas/server/lib/build_embeddable_filters.ts index 8de813255a230..ca34246531bff 100644 --- a/x-pack/legacy/plugins/canvas/server/lib/build_embeddable_filters.ts +++ b/x-pack/legacy/plugins/canvas/server/lib/build_embeddable_filters.ts @@ -4,14 +4,14 @@ * you may not use this file except in compliance with the Elastic License. */ -import { buildQueryFilter, Filter as ESFilterType } from '@kbn/es-query'; import { TimeRange } from 'src/plugins/data/public'; import { Filter } from '../../types'; // @ts-ignore Untyped Local import { buildBoolArray } from './build_bool_array'; +import { esFilters } from '../../../../../../src/plugins/data/common'; export interface EmbeddableFilterInput { - filters: ESFilterType[]; + filters: esFilters.Filter[]; timeRange?: TimeRange; } @@ -30,8 +30,10 @@ function getTimeRangeFromFilters(filters: Filter[]): TimeRange | undefined { : undefined; } -function getQueryFilters(filters: Filter[]): ESFilterType[] { - return buildBoolArray(filters.filter(filter => filter.type !== 'time')).map(buildQueryFilter); +function getQueryFilters(filters: Filter[]): esFilters.Filter[] { + return buildBoolArray(filters.filter(filter => filter.type !== 'time')).map( + esFilters.buildQueryFilter + ); } export function buildEmbeddableFilters(filters: Filter[]): EmbeddableFilterInput { diff --git a/x-pack/legacy/plugins/canvas/server/routes/shareables.ts b/x-pack/legacy/plugins/canvas/server/routes/shareables.ts index 5159cde48b3ef..e8186ceceb47f 100644 --- a/x-pack/legacy/plugins/canvas/server/routes/shareables.ts +++ b/x-pack/legacy/plugins/canvas/server/routes/shareables.ts @@ -16,7 +16,6 @@ import { SHAREABLE_RUNTIME_FILE, SHAREABLE_RUNTIME_NAME, SHAREABLE_RUNTIME_SRC, - SHAREABLE_RUNTIME_OUTPUT, } from '../../shareable_runtime/constants'; import { CoreSetup } from '../shim'; @@ -26,14 +25,13 @@ export function shareableWorkpads(route: CoreSetup['http']['route']) { route({ method: 'GET', path: API_ROUTE_SHAREABLE_RUNTIME, - options: { - files: { - relativeTo: SHAREABLE_RUNTIME_OUTPUT, - }, - }, + handler: { file: { path: SHAREABLE_RUNTIME_FILE, + // The option setting is not for typical use. We're using it here to avoid + // problems in Cloud environments. See elastic/kibana#47405. + confine: false, }, }, }); @@ -42,14 +40,12 @@ export function shareableWorkpads(route: CoreSetup['http']['route']) { route({ method: 'GET', path: API_ROUTE_SHAREABLE_RUNTIME_DOWNLOAD, - options: { - files: { - relativeTo: SHAREABLE_RUNTIME_OUTPUT, - }, - }, + handler(_request, handler) { + // The option setting is not for typical use. We're using it here to avoid + // problems in Cloud environments. See elastic/kibana#47405. // @ts-ignore No type for inert Hapi handler - const file = handler.file(SHAREABLE_RUNTIME_FILE); + const file = handler.file(SHAREABLE_RUNTIME_FILE, { confine: false }); file.type('application/octet-stream'); return file; }, diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/shareable.test.tsx b/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/shareable.test.tsx index ea944bd30e9b8..a55c87c2d74a2 100644 --- a/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/shareable.test.tsx +++ b/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/shareable.test.tsx @@ -32,7 +32,7 @@ describe('Canvas Shareable Workpad API', () => { test('Placed successfully with default properties', async () => { const container = document.createElement('div'); document.body.appendChild(container); - const wrapper = mount(
, { + const wrapper = mount(
, { attachTo: container, }); @@ -46,11 +46,7 @@ describe('Canvas Shareable Workpad API', () => { const container = document.createElement('div'); document.body.appendChild(container); const wrapper = mount( -
, +
, { attachTo: container, } @@ -69,11 +65,7 @@ describe('Canvas Shareable Workpad API', () => { const container = document.createElement('div'); document.body.appendChild(container); const wrapper = mount( -
, +
, { attachTo: container, } @@ -97,7 +89,7 @@ describe('Canvas Shareable Workpad API', () => { kbn-canvas-width="350" kbn-canvas-height="350" kbn-canvas-url="workpad.json" - >
, + />, { attachTo: container, } @@ -116,7 +108,7 @@ describe('Canvas Shareable Workpad API', () => { const container = document.createElement('div'); document.body.appendChild(container); const wrapper = mount( -
, +
, { attachTo: container, } diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap index baa0b509ccb73..072cf01255a0d 100644 --- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap +++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap @@ -17,8 +17,11 @@ exports[` can navigate Autoplay Settings 1`] = ` data-focus-lock-disabled="disabled" >