Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into 50395-refactor-lo…
Browse files Browse the repository at this point in the history
…g-entries
  • Loading branch information
Zacqary committed Dec 9, 2019
2 parents 030cd5f + 77dca06 commit 550e485
Show file tree
Hide file tree
Showing 156 changed files with 2,451 additions and 829 deletions.
1 change: 1 addition & 0 deletions .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"kbn": "src/legacy/core_plugins/kibana",
"kbnDocViews": "src/legacy/core_plugins/kbn_doc_views",
"kbnVislibVisTypes": "src/legacy/core_plugins/kbn_vislib_vis_types",
"management": "src/legacy/core_plugins/management",
"kibana_react": "src/legacy/core_plugins/kibana_react",
"kibana-react": "src/plugins/kibana_react",
"kibana_utils": "src/plugins/kibana_utils",
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"@elastic/charts": "^14.0.0",
"@elastic/datemath": "5.0.2",
"@elastic/ems-client": "1.0.5",
"@elastic/eui": "16.1.0",
"@elastic/eui": "17.0.0",
"@elastic/filesaver": "1.1.2",
"@elastic/good": "8.1.1-kibana2",
"@elastic/numeral": "2.3.3",
Expand Down Expand Up @@ -360,8 +360,8 @@
"@types/uuid": "^3.4.4",
"@types/vinyl-fs": "^2.4.11",
"@types/zen-observable": "^0.8.0",
"@typescript-eslint/eslint-plugin": "^2.9.0",
"@typescript-eslint/parser": "^2.9.0",
"@typescript-eslint/eslint-plugin": "^2.10.0",
"@typescript-eslint/parser": "^2.10.0",
"angular-mocks": "^1.7.8",
"archiver": "^3.1.1",
"axe-core": "^3.3.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-config-kibana/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
},
"homepage": "https://github.com/elastic/eslint-config-kibana#readme",
"peerDependencies": {
"@typescript-eslint/eslint-plugin": "^2.9.0",
"@typescript-eslint/parser": "^2.9.0",
"@typescript-eslint/eslint-plugin": "^2.10.0",
"@typescript-eslint/parser": "^2.10.0",
"babel-eslint": "^10.0.3",
"eslint": "^6.5.1",
"eslint-plugin-babel": "^5.3.0",
Expand Down
17 changes: 15 additions & 2 deletions packages/kbn-ui-framework/dist/kui_dark.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
/* 1 */
/* 1 */
/**
* 1. Extend beta badges to at least 40% of the container's width
* 2. Fix for IE to ensure badges are visible outside of a <button> tag
*/
/**
* 1. Apply margin to all but last item in the flex.
* 2. Margin gets flipped because of the row-reverse.
*/
/**
* 2. Account for inner box-shadow style border when in group
* 3. Must supply both values to background-size or some browsers apply the single value to both directions
*/
/**
* 4. Override invalid state with focus state.
*/
/**
* Mixin for use in:
* - EuiCard
* - EuiPageContent
*/
/**
* 1. Enforce pointer when there's no href.
* 2. Allow these styles to be applied to a button element.
Expand Down Expand Up @@ -1595,7 +1609,6 @@ main {
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
height: 100%;
padding: 12px 8px;
font-size: 16px;
font-weight: bold;
Expand Down
33 changes: 23 additions & 10 deletions packages/kbn-ui-framework/dist/kui_light.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
/* 1 */
/* 1 */
/**
* 1. Extend beta badges to at least 40% of the container's width
* 2. Fix for IE to ensure badges are visible outside of a <button> tag
*/
/**
* 1. Apply margin to all but last item in the flex.
* 2. Margin gets flipped because of the row-reverse.
*/
/**
* 2. Account for inner box-shadow style border when in group
* 3. Must supply both values to background-size or some browsers apply the single value to both directions
*/
/**
* 4. Override invalid state with focus state.
*/
/**
* Mixin for use in:
* - EuiCard
* - EuiPageContent
*/
/**
* 1. Enforce pointer when there's no href.
* 2. Allow these styles to be applied to a button element.
Expand Down Expand Up @@ -522,7 +536,7 @@ main {
-webkit-appearance: none;
/* 1 */
background-color: #fbfcfd;
border: 1px solid rgba(0, 0, 0, 0.1);
border: 1px solid rgba(15, 39, 118, 0.1);
border-radius: 4px;
width: 16px;
height: 16px;
Expand Down Expand Up @@ -623,7 +637,7 @@ main {
line-height: 1.5;
color: #343741;
background-color: #fbfcfd;
border: 1px solid rgba(0, 0, 0, 0.1);
border: 1px solid rgba(15, 39, 118, 0.1);
border-radius: 4px;
-webkit-transition: border-color 0.1s linear;
transition: border-color 0.1s linear;
Expand Down Expand Up @@ -662,7 +676,7 @@ main {
line-height: 1.5;
color: #343741;
background-color: #fbfcfd;
border: 1px solid rgba(0, 0, 0, 0.1);
border: 1px solid rgba(15, 39, 118, 0.1);
border-radius: 4px;
-webkit-transition: border-color 0.1s linear;
transition: border-color 0.1s linear;
Expand Down Expand Up @@ -734,7 +748,7 @@ main {
line-height: 1.5;
color: #343741;
background-color: #fbfcfd;
border: 1px solid rgba(0, 0, 0, 0.1);
border: 1px solid rgba(15, 39, 118, 0.1);
border-radius: 4px;
-webkit-transition: border-color 0.1s linear;
transition: border-color 0.1s linear;
Expand Down Expand Up @@ -777,7 +791,7 @@ main {
line-height: 1.5;
color: #343741;
background-color: #fbfcfd;
border: 1px solid rgba(0, 0, 0, 0.1);
border: 1px solid rgba(15, 39, 118, 0.1);
border-radius: 4px;
-webkit-transition: border-color 0.1s linear;
transition: border-color 0.1s linear;
Expand Down Expand Up @@ -1252,7 +1266,7 @@ main {
font-size: 14px;
color: #343741;
background-color: #fbfcfd;
border: 1px solid rgba(0, 0, 0, 0.1);
border: 1px solid rgba(15, 39, 118, 0.1);
border-radius: 4px; }
.kuiLocalDropdownInput:focus {
border-color: #006BB4; }
Expand Down Expand Up @@ -1410,7 +1424,7 @@ main {
line-height: 1.5;
color: #343741;
background-color: #fbfcfd;
border: 1px solid rgba(0, 0, 0, 0.1);
border: 1px solid rgba(15, 39, 118, 0.1);
border-radius: 4px;
-webkit-transition: border-color 0.1s linear;
transition: border-color 0.1s linear;
Expand Down Expand Up @@ -1491,7 +1505,7 @@ main {
line-height: 1.5;
color: #343741;
background-color: #fbfcfd;
border: 1px solid rgba(0, 0, 0, 0.1);
border: 1px solid rgba(15, 39, 118, 0.1);
border-radius: 4px;
-webkit-transition: border-color 0.1s linear;
transition: border-color 0.1s linear;
Expand Down Expand Up @@ -1595,7 +1609,6 @@ main {
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
height: 100%;
padding: 12px 8px;
font-size: 16px;
font-weight: bold;
Expand Down
2 changes: 0 additions & 2 deletions packages/kbn-ui-framework/src/kui_dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
@import '../../../node_modules/@elastic/eui/src/global_styling/functions/index';
@import '../../../node_modules/@elastic/eui/src/global_styling/variables/index';
@import '../../../node_modules/@elastic/eui/src/global_styling/mixins/index';
@import '../../../node_modules/@elastic/eui/src/components/form/variables';
@import '../../../node_modules/@elastic/eui/src/components/form/mixins';

// Configuration
@import 'global_styling/variables/index';
Expand Down
2 changes: 0 additions & 2 deletions packages/kbn-ui-framework/src/kui_light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
@import '../../../node_modules/@elastic/eui/src/global_styling/functions/index';
@import '../../../node_modules/@elastic/eui/src/global_styling/variables/index';
@import '../../../node_modules/@elastic/eui/src/global_styling/mixins/index';
@import '../../../node_modules/@elastic/eui/src/components/form/variables';
@import '../../../node_modules/@elastic/eui/src/components/form/mixins';

// Configuration
@import 'global_styling/variables/index';
Expand Down
2 changes: 1 addition & 1 deletion src/core/MIGRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -1193,7 +1193,7 @@ import { setup, start } from '../core_plugins/visualizations/public/legacy';
| Legacy Platform | New Platform | Notes |
| ------------------------------------------------- | ------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
| `import 'ui/apply_filters'` | `import { applyFiltersPopover } from '../data/public'` | Directive is deprecated. |
| `import 'ui/apply_filters'` | N/A. Replaced by triggering an APPLY_FILTER_TRIGGER trigger. | Directive is deprecated. |
| `import 'ui/filter_bar'` | `import { FilterBar } from '../data/public'` | Directive is deprecated. |
| `import 'ui/query_bar'` | `import { QueryStringInput } from '../data/public'` | Directives are deprecated. |
| `import 'ui/search_bar'` | `import { SearchBar } from '../data/public'` | Directive is deprecated. |
Expand Down
6 changes: 4 additions & 2 deletions src/core/public/chrome/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
* under the License.
*/

export const KIBANA_FEEDBACK_LINK = 'https://www.elastic.co/products/kibana/feedback';
export const KIBANA_ASK_ELASTIC_LINK = 'https://www.elastic.co/products/kibana/ask-elastic';
export const KIBANA_FEEDBACK_LINK =
'https://www.elastic.co/products/kibana/feedback?blade=kibanafeedback';
export const KIBANA_ASK_ELASTIC_LINK =
'https://www.elastic.co/products/kibana/ask-elastic?blade=kibanaaskelastic';
export const GITHUB_CREATE_ISSUE_LINK = 'https://github.com/elastic/kibana/issues/new/choose';
1 change: 0 additions & 1 deletion src/legacy/core_plugins/data/public/legacy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,4 @@ export const setup = dataPlugin.setup(npSetup.core);

export const start = dataPlugin.start(npStart.core, {
data: npStart.plugins.data,
uiActions: npSetup.plugins.uiActions,
});
20 changes: 1 addition & 19 deletions src/legacy/core_plugins/data/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,12 @@ import { createSearchBar, StatetfulSearchBarProps } from './search';
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';
import {
createFilterAction,
GLOBAL_APPLY_FILTER_ACTION,
} from './filter/action/apply_filter_action';
import { APPLY_FILTER_TRIGGER } from '../../../../plugins/embeddable/public';

// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { setFieldFormats } from '../../../../plugins/data/public/services';

export interface DataPluginStartDependencies {
data: DataPublicPluginStart;
uiActions: IUiActionsSetup;
}

/**
Expand Down Expand Up @@ -67,7 +60,7 @@ export class DataPlugin implements Plugin<void, DataStart, {}, DataPluginStartDe
this.storage = new Storage(window.localStorage);
}

public start(core: CoreStart, { data, uiActions }: DataPluginStartDependencies): DataStart {
public start(core: CoreStart, { data }: DataPluginStartDependencies): DataStart {
// This is required for when Angular code uses Field and FieldList.
setFieldFormats(data.fieldFormats);
initLegacyModule(data.indexPatterns);
Expand All @@ -78,17 +71,6 @@ export class DataPlugin implements Plugin<void, DataStart, {}, DataPluginStartDe
storage: this.storage,
});

uiActions.registerAction(
createFilterAction(
core.overlays,
data.query.filterManager,
data.query.timefilter.timefilter,
data.indexPatterns
)
);

uiActions.attachAction(APPLY_FILTER_TRIGGER, GLOBAL_APPLY_FILTER_ACTION);

return {
ui: {
SearchBar,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import 'node_modules/@elastic/eui/src/components/panel/mixins';

discover-app {
flex-grow: 1;

Expand Down Expand Up @@ -37,7 +35,7 @@ discover-app {
z-index: 1;
}

@include euiPanel('dscWrapper__content');
@include euiPanel('.dscWrapper__content');

.dscWrapper__content {
padding-top: $euiSizeXS;
Expand Down Expand Up @@ -213,7 +211,6 @@ discover-app {
}

.dscResults {

h3 {
margin: -20px 0 10px 0;
text-align: center;
Expand Down
2 changes: 0 additions & 2 deletions src/legacy/core_plugins/kibana/public/index.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
@import 'src/legacy/ui/public/styles/styling_constants';

// Elastic charts
@import '@elastic/eui/src/components/tool_tip/variables';
@import '@elastic/eui/src/components/tool_tip/mixins';
@import '@elastic/charts/dist/theme';
@import '@elastic/eui/src/themes/charts/theme';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ export class StepTimeField extends Component {
constructor(props) {
super(props);

const { getIndexPatternType, getIndexPatternName } = props.indexPatternCreationType;

this.state = {
error: '',
timeFields: [],
Expand All @@ -61,8 +59,8 @@ export class StepTimeField extends Component {
isFetchingTimeFields: false,
isCreating: false,
indexPatternId: '',
indexPatternType: getIndexPatternType(),
indexPatternName: getIndexPatternName(),
indexPatternType: props.indexPatternCreationType.getIndexPatternType(),
indexPatternName: props.indexPatternCreationType.getIndexPatternName(),
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { SavedObjectsClientProvider } from 'ui/saved_objects';
import uiRoutes from 'ui/routes';
import angularTemplate from './angular_template.html';
import 'ui/index_patterns';
import { IndexPatternCreationFactory } from 'ui/management/index_pattern_creation';
import { setup as managementSetup } from '../../../../../../management/public/legacy';
import { getCreateBreadcrumbs } from '../breadcrumbs';

import { renderCreateIndexPatternWizard, destroyCreateIndexPatternWizard } from './render';
Expand All @@ -35,8 +35,9 @@ uiRoutes.when('/management/kibana/index_pattern', {
const Private = $injector.get('Private');
$scope.$$postDigest(() => {
const $routeParams = $injector.get('$routeParams');
const indexPatternCreationProvider = Private(IndexPatternCreationFactory)($routeParams.type);
const indexPatternCreationType = indexPatternCreationProvider.getType();
const indexPatternCreationType = managementSetup.indexPattern.creation.getType(
$routeParams.type
);
const services = {
config: $injector.get('config'),
es: $injector.get('es'),
Expand All @@ -52,12 +53,9 @@ uiRoutes.when('/management/kibana/index_pattern', {

const initialQuery = $routeParams.id ? decodeURIComponent($routeParams.id) : undefined;

renderCreateIndexPatternWizard(
initialQuery,
services
);
renderCreateIndexPatternWizard(initialQuery, services);
});

$scope.$on('$destroy', destroyCreateIndexPatternWizard);
}
},
});
Loading

0 comments on commit 550e485

Please sign in to comment.