Skip to content

Commit 32416ac

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into chore/test-ua-mappings
2 parents 81640fe + b9413cf commit 32416ac

347 files changed

Lines changed: 5214 additions & 2895 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
"@elastic/apm-rum": "^5.2.0",
126126
"@elastic/charts": "19.8.1",
127127
"@elastic/datemath": "5.0.3",
128-
"@elastic/elasticsearch": "7.9.0-rc.1",
128+
"@elastic/elasticsearch": "7.9.0-rc.2",
129129
"@elastic/ems-client": "7.9.3",
130130
"@elastic/eui": "26.3.1",
131131
"@elastic/filesaver": "1.1.2",
@@ -322,7 +322,7 @@
322322
"@types/browserslist-useragent": "^3.0.0",
323323
"@types/chance": "^1.0.0",
324324
"@types/cheerio": "^0.22.10",
325-
"@types/chromedriver": "^2.38.0",
325+
"@types/chromedriver": "^81.0.0",
326326
"@types/classnames": "^2.2.9",
327327
"@types/color": "^3.0.0",
328328
"@types/d3": "^3.5.43",
@@ -411,7 +411,7 @@
411411
"chai": "3.5.0",
412412
"chance": "1.0.18",
413413
"cheerio": "0.22.0",
414-
"chromedriver": "^83.0.0",
414+
"chromedriver": "^84.0.0",
415415
"classnames": "2.2.6",
416416
"dedent": "^0.7.0",
417417
"delete-empty": "^2.0.0",

‎packages/kbn-plugin-generator/sao_template/sao.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,11 @@ module.exports = function ({ name, targetPath }) {
120120
return !customPath;
121121
},
122122
},
123+
generateTsconfig: {
124+
type: 'confirm',
125+
message: 'Would you like to use a custom tsconfig file?',
126+
default: true,
127+
},
123128
},
124129
filters: {
125130
'public/**/index.scss': 'generateScss',
@@ -128,6 +133,7 @@ module.exports = function ({ name, targetPath }) {
128133
'translations/**/*': 'generateTranslations',
129134
'i18nrc.json': 'generateTranslations',
130135
'eslintrc.js': 'generateEslint',
136+
'tsconfig.json': 'generateTsconfig',
131137
},
132138
move: {
133139
'eslintrc.js': '.eslintrc.js',

‎packages/kbn-plugin-generator/sao_template/sao.test.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,14 @@ describe('plugin generator sao integration', () => {
8080
generateApi: true,
8181
generateScss: false,
8282
generateEslint: false,
83+
generateTsconfig: false,
8384
});
8485

8586
// check output files
8687
expect(res.fileList).toContain('public/plugin.ts');
8788
expect(res.fileList).not.toContain('public/index.scss');
8889
expect(res.fileList).not.toContain('.eslintrc.js');
90+
expect(res.fileList).not.toContain('tsconfig.json');
8991
});
9092

9193
it('plugin package has correct title', async () => {
@@ -136,6 +138,7 @@ describe('plugin generator sao integration', () => {
136138

137139
it('includes dotfiles', async () => {
138140
const res = await sao.mockPrompt(template);
141+
expect(res.files['tsconfig.json']).toBeTruthy();
139142
expect(res.files['.eslintrc.js']).toBeTruthy();
140143
expect(res.files['.i18nrc.json']).toBeTruthy();
141144
});

‎packages/kbn-plugin-generator/sao_template/template/public/components/app.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export const <%= upperCamelCaseName %>App = ({ basename, notifications, http, na
7373
<Router basename={basename}>
7474
<I18nProvider>
7575
<>
76-
<navigation.ui.TopNavMenu appName={ PLUGIN_ID } showSearchBar={true} />
76+
<navigation.ui.TopNavMenu appName={ PLUGIN_ID } showSearchBar={true} useDefaultBehaviors={true}/>
7777
<EuiPage restrictWidth="1000px">
7878
<EuiPageBody>
7979
<EuiPageHeader>

‎packages/kbn-plugin-generator/sao_template/template/tsconfig.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"extends": "../../tsconfig.json",
3+
"compilerOptions": {
4+
"outDir": "./target",
5+
"skipLibCheck": true
6+
},
7+
"include": [
8+
"index.ts",
9+
"common/**/*.ts",
10+
"public/**/*.ts",
11+
"public/**/*.tsx",
12+
"server/**/*.ts",
13+
"../../typings/**/*",
14+
],
15+
"exclude": []
16+
}

‎src/core/public/index.scss‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
@import './chrome/index';
33
@import './overlays/index';
44
@import './rendering/index';
5+
@import './styles/index';
56

6-
// Global styles need to be migrated
7-
@import '../../legacy/ui/public/styles/_legacy/_index';

src/legacy/ui/public/styles/_legacy/components/_ace_overrides.scss renamed to src/core/public/styles/_ace_overrides.scss

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
@import '@elastic/eui/src/components/call_out/variables';
2-
@import '@elastic/eui/src/components/call_out/mixins';
3-
41
// SASSTODO: Replace with an EUI editor
52
// Intentionally not using the EuiCodeBlock colors here because they actually change
63
// hue from light to dark theme. So some colors would change while others wouldn't.
@@ -181,7 +178,7 @@
181178
}
182179

183180
&.ace_multiselect .ace_selection.ace_start {
184-
box-shadow: 0 0 3px 0px $euiColorEmptyShade;
181+
box-shadow: 0 0 3px 0 $euiColorEmptyShade;
185182
}
186183

187184
.ace_marker-layer .ace_step {

‎src/core/public/styles/_base.scss‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
@import '@elastic/eui/src/components/collapsible_nav/variables';
2+
// Application Layout
3+
4+
// chrome-context
5+
// TODO #64541
6+
// Delete this block
7+
.chrHeaderWrapper:not(.headerWrapper) .content {
8+
display: flex;
9+
flex-flow: row nowrap;
10+
width: 100%;
11+
height: 100%;
12+
overflow: hidden;
13+
}
14+
15+
.application,
16+
.app-container {
17+
> * {
18+
position: relative;
19+
}
20+
}
21+
22+
.application {
23+
position: relative;
24+
z-index: 0;
25+
display: flex;
26+
flex-grow: 1;
27+
flex-shrink: 0;
28+
flex-basis: auto;
29+
flex-direction: column;
30+
31+
> * {
32+
flex-shrink: 0;
33+
}
34+
}
35+
36+
// We apply brute force focus states to anything not coming from Eui
37+
// which has focus states designed at the component level.
38+
// You can also use "kbn-resetFocusState" to not apply the default focus
39+
// state. This is useful when you've already hand crafted your own
40+
// focus states in Kibana.
41+
:focus {
42+
&:not([class^='eui']):not(.kbn-resetFocusState) {
43+
@include euiFocusRing;
44+
}
45+
}
46+
47+
// A necessary hack so that the above focus policy doesn't pollute some EUI
48+
// entrenched inputs.
49+
.euiComboBox {
50+
// :not() specificity needed to override the above
51+
input:not([class^='eui']):focus {
52+
animation: none !important;
53+
}
54+
}
55+
56+
.euiBody--collapsibleNavIsDocked .euiBottomBar {
57+
margin-left: $euiCollapsibleNavWidth;
58+
}

‎src/core/public/styles/_index.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@import './base';
2+
@import './ace_overrides';

‎src/core/server/elasticsearch/client/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ export { IScopedClusterClient, ScopedClusterClient } from './scoped_cluster_clie
2222
export { ElasticsearchClientConfig } from './client_config';
2323
export { IClusterClient, ICustomClusterClient, ClusterClient } from './cluster_client';
2424
export { configureClient } from './configure_client';
25+
export { retryCallCluster, migrationRetryCallCluster } from './retry_call_cluster';

0 commit comments

Comments
 (0)