Skip to content

Commit

Permalink
Merge branch 'master' into unskip-dashboard-migration-integration-test
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Apr 19, 2021
2 parents c1f82e4 + efcf7d1 commit e1d66a4
Show file tree
Hide file tree
Showing 73 changed files with 1,414 additions and 413 deletions.
1 change: 1 addition & 0 deletions docs/developer/getting-started/monorepo-packages.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ yarn kbn watch-bazel

- @elastic/datemath
- @kbn/apm-utils
- @kbn/babel-preset
- @kbn/config-schema
- @kbn/tinymath
- @kbn/utility-types
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
<b>Signature:</b>

```typescript
export declare type EsQuerySortValue = Record<string, SortDirection | SortDirectionNumeric>;
export declare type EsQuerySortValue = Record<string, SortDirection | SortDirectionNumeric | SortDirectionFormat>;
```
28 changes: 23 additions & 5 deletions examples/search_examples/public/search/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ export const SearchExamplesApp = ({
});
};

const doSearchSourceSearch = async () => {
const doSearchSourceSearch = async (otherBucket: boolean) => {
if (!indexPattern) return;

const query = data.query.queryString.getQuery();
Expand All @@ -221,7 +221,7 @@ export const SearchExamplesApp = ({
aggDef.push({
type: 'terms',
schema: 'split',
params: { field: selectedBucketField.name, size: 2, otherBucket: true },
params: { field: selectedBucketField.name, size: 2, otherBucket },
});
}
if (selectedNumericField) {
Expand Down Expand Up @@ -280,8 +280,8 @@ export const SearchExamplesApp = ({
}
};

const onSearchSourceClickHandler = () => {
doSearchSourceSearch();
const onSearchSourceClickHandler = (withOtherBucket: boolean) => {
doSearchSourceSearch(withOtherBucket);
};

const reqTabs = [
Expand Down Expand Up @@ -367,6 +367,7 @@ export const SearchExamplesApp = ({
setIndexPattern(newIndexPattern);
}}
isClearable={false}
data-test-subj="indexPatternSelector"
/>
</EuiFlexItem>
<EuiFlexItem>
Expand Down Expand Up @@ -449,7 +450,7 @@ export const SearchExamplesApp = ({
</EuiText>
<EuiButtonEmpty
size="xs"
onClick={onSearchSourceClickHandler}
onClick={() => onSearchSourceClickHandler(true)}
iconType="play"
data-test-subj="searchSourceWithOther"
>
Expand All @@ -464,6 +465,23 @@ export const SearchExamplesApp = ({
defaultMessage="Bucket and metrics aggregations with other bucket."
/>
</EuiText>
<EuiButtonEmpty
size="xs"
onClick={() => onSearchSourceClickHandler(false)}
iconType="play"
data-test-subj="searchSourceWithoutOther"
>
<FormattedMessage
id="searchExamples.searchSource.buttonText"
defaultMessage="Request from high-level client (data.search.searchSource)"
/>
</EuiButtonEmpty>
<EuiText size="xs" color="subdued" className="searchExampleStepDsc">
<FormattedMessage
id="searchExamples.buttonText"
defaultMessage="Bucket and metrics aggregations without other bucket."
/>
</EuiText>
</EuiText>
<EuiSpacer />
<EuiTitle size="s">
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@
"@istanbuljs/schema": "^0.1.2",
"@jest/reporters": "^26.5.2",
"@kbn/babel-code-parser": "link:packages/kbn-babel-code-parser",
"@kbn/babel-preset": "link:packages/kbn-babel-preset",
"@kbn/babel-preset": "link:bazel-bin/packages/kbn-babel-preset/npm_module",
"@kbn/cli-dev-mode": "link:packages/kbn-cli-dev-mode",
"@kbn/dev-utils": "link:packages/kbn-dev-utils",
"@kbn/docs-utils": "link:packages/kbn-docs-utils",
Expand Down
1 change: 1 addition & 0 deletions packages/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ filegroup(
srcs = [
"//packages/elastic-datemath:build",
"//packages/kbn-apm-utils:build",
"//packages/kbn-babel-preset:build",
"//packages/kbn-config-schema:build",
"//packages/kbn-tinymath:build",
"//packages/kbn-utility-types:build",
Expand Down
3 changes: 1 addition & 2 deletions packages/kbn-ace/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"kbn:bootstrap": "yarn build --dev"
},
"devDependencies": {
"@kbn/dev-utils": "link:../kbn-dev-utils",
"@kbn/babel-preset": "link:../kbn-babel-preset"
"@kbn/dev-utils": "link:../kbn-dev-utils"
}
}
3 changes: 1 addition & 2 deletions packages/kbn-analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"kbn:watch": "node scripts/build --source-maps --watch"
},
"devDependencies": {
"@kbn/dev-utils": "link:../kbn-dev-utils",
"@kbn/babel-preset": "link:../kbn-babel-preset"
"@kbn/dev-utils": "link:../kbn-dev-utils"
}
}
3 changes: 0 additions & 3 deletions packages/kbn-babel-code-parser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,5 @@
"build": "../../node_modules/.bin/babel src --out-dir target",
"kbn:bootstrap": "yarn build --quiet",
"kbn:watch": "yarn build --watch"
},
"dependencies": {
"@kbn/babel-preset": "link:../kbn-babel-preset"
}
}
63 changes: 63 additions & 0 deletions packages/kbn-babel-preset/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")

PKG_BASE_NAME = "kbn-babel-preset"
PKG_REQUIRE_NAME = "@kbn/babel-preset"

SOURCE_FILES = glob([
"common_babel_parser_options.js",
"common_preset.js",
"istanbul_preset.js",
"node_preset.js",
"webpack_preset.js",
])

SRCS = SOURCE_FILES

filegroup(
name = "srcs",
srcs = SRCS,
)

NPM_MODULE_EXTRA_FILES = [
"package.json",
"README.md",
]

DEPS = [
"@npm//@babel/plugin-proposal-class-properties",
"@npm//@babel/plugin-proposal-export-namespace-from",
"@npm//@babel/plugin-proposal-nullish-coalescing-operator",
"@npm//@babel/plugin-proposal-optional-chaining",
"@npm//@babel/plugin-proposal-private-methods",
"@npm//@babel/preset-env",
"@npm//@babel/preset-react",
"@npm//@babel/preset-typescript",
"@npm//babel-plugin-add-module-exports",
"@npm//babel-plugin-styled-components",
]

js_library(
name = PKG_BASE_NAME,
srcs = [
":srcs",
],
deps = DEPS,
package_name = PKG_REQUIRE_NAME,
visibility = ["//visibility:public"],
)

pkg_npm(
name = "npm_module",
srcs = NPM_MODULE_EXTRA_FILES,
deps = [
":%s" % PKG_BASE_NAME,
]
)

filegroup(
name = "build",
srcs = [
":npm_module",
],
visibility = ["//visibility:public"],
)
1 change: 0 additions & 1 deletion packages/kbn-dev-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"@kbn/utils": "link:../kbn-utils"
},
"devDependencies": {
"@kbn/babel-preset": "link:../kbn-babel-preset",
"@kbn/expect": "link:../kbn-expect"
}
}
3 changes: 0 additions & 3 deletions packages/kbn-es/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,5 @@
},
"dependencies": {
"@kbn/dev-utils": "link:../kbn-dev-utils"
},
"devDependencies": {
"@kbn/babel-preset": "link:../kbn-babel-preset"
}
}
1 change: 0 additions & 1 deletion packages/kbn-i18n/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"kbn:watch": "node scripts/build --watch --source-maps"
},
"devDependencies": {
"@kbn/babel-preset": "link:../kbn-babel-preset",
"@kbn/dev-utils": "link:../kbn-dev-utils"
}
}
1 change: 0 additions & 1 deletion packages/kbn-interpreter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"@kbn/i18n": "link:../kbn-i18n"
},
"devDependencies": {
"@kbn/babel-preset": "link:../kbn-babel-preset",
"@kbn/dev-utils": "link:../kbn-dev-utils"
}
}
1 change: 0 additions & 1 deletion packages/kbn-monaco/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"build:antlr4ts": "../../node_modules/antlr4ts-cli/antlr4ts ./src/painless/antlr/painless_lexer.g4 ./src/painless/antlr/painless_parser.g4 && node ./scripts/fix_generated_antlr.js"
},
"devDependencies": {
"@kbn/babel-preset": "link:../kbn-babel-preset",
"@kbn/dev-utils": "link:../kbn-dev-utils"
},
"dependencies": {
Expand Down
1 change: 0 additions & 1 deletion packages/kbn-optimizer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"kbn:watch": "yarn build --watch"
},
"dependencies": {
"@kbn/babel-preset": "link:../kbn-babel-preset",
"@kbn/config": "link:../kbn-config",
"@kbn/dev-utils": "link:../kbn-dev-utils",
"@kbn/std": "link:../kbn-std",
Expand Down
1 change: 0 additions & 1 deletion packages/kbn-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"@kbn/optimizer": "link:../kbn-optimizer"
},
"devDependencies": {
"@kbn/babel-preset": "link:../kbn-babel-preset",
"@kbn/dev-utils": "link:../kbn-dev-utils",
"@kbn/expect": "link:../kbn-expect",
"@kbn/utils": "link:../kbn-utils"
Expand Down
1 change: 0 additions & 1 deletion packages/kbn-ui-shared-deps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"@kbn/monaco": "link:../kbn-monaco"
},
"devDependencies": {
"@kbn/babel-preset": "link:../kbn-babel-preset",
"@kbn/dev-utils": "link:../kbn-dev-utils"
}
}
Binary file added rfcs/images/url_service/new_architecture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added rfcs/images/url_service/old_architecture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e1d66a4

Please sign in to comment.