Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moved markdown to kibana_react shim plugin #42684

Merged
merged 155 commits into from
Aug 13, 2019
Merged
Show file tree
Hide file tree
Changes from 153 commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
e5f6f9c
kbn top nav in discover
Jun 19, 2019
d5d7e38
New top nav in dashboard and vis editor
Jun 19, 2019
3b97926
change kbn top nav directive
Jun 19, 2019
1ea5b7b
Stop using template feature of kbn top nav
Jun 26, 2019
8a7ba6b
Combined css
Jun 27, 2019
c4b84bf
Merge remote-tracking branch 'upstream/master' into newplatform/kbn-t…
Jun 27, 2019
2e90a18
Merge branch 'newplatform/kbn-top-nav/graph' into newplatform/kbn-top…
Jun 27, 2019
344b055
console top nav
Jun 27, 2019
3c5878b
Removed unnecessary use of kbn-top-nav in dev tools app (wrapping tabs)
Jun 27, 2019
d01d882
Merge branch 'newplatform/kbn-top-nav/devtools-2' into newplatform/kb…
Jun 27, 2019
366b03a
Changed console menu to new directive
Jun 27, 2019
5b0a63d
Merge remote-tracking branch 'upstream/master' into newplatform/kbn-t…
Jun 30, 2019
9599e15
Merge remote-tracking branch 'upstream/master' into newplatform/kbn-t…
Jul 1, 2019
4766510
CSS adjustments + functional implementation of top nav menu item
Jul 1, 2019
b23d0c3
Merge remote-tracking branch 'upstream/master' into newplatform/kbn-t…
Jul 1, 2019
929ed9c
Fixed DevTools top nav toggle
Jul 2, 2019
6adc512
Optional show-border
Jul 2, 2019
0f24457
timelion menu works
Jul 2, 2019
f6906b7
Improve filter sorting logic to be more stable
Jul 3, 2019
c5d3a14
Merge branch 'bug/filter-manager/sorting-logic-failure' into newplatf…
Jul 3, 2019
20a9922
Support showing filter bar as part of top nav
Jul 3, 2019
daf6f98
Use search bar in top nav in discover and maps
Jul 3, 2019
c580fe7
tmp revert
Jul 4, 2019
78ea450
Merge remote-tracking branch 'upstream/master' into newplatform/kbn-t…
Jul 4, 2019
b3711e6
Align search bar settings accross apps
Jul 4, 2019
3117fce
Reverted change in ML, removed unused css
Jul 4, 2019
3cfa5c7
Merge remote-tracking branch 'upstream/master' into newplatform/kbn-t…
Jul 4, 2019
e749bd4
Added data test subj to top nav menu items
Jul 4, 2019
fa5332d
Watch config by value
Jul 4, 2019
833d49f
Some directive magic to make sure that disabledButtons functions are …
Jul 5, 2019
8fee73a
Fix missing controls from new top nav in some visualizations
Jul 7, 2019
cc5dbff
Merge remote-tracking branch 'upstream/master' into newplatform/kbn-t…
Jul 7, 2019
d368c94
showAutoRefreshOnly in input controls visualization
Jul 7, 2019
000eeb2
Fixed inspector disabled test
Jul 7, 2019
efe00bf
Fix dashboard action links
Jul 7, 2019
97496c6
snapshots
Jul 7, 2019
d52e581
Fixed maps filter bar
Jul 7, 2019
8c06d39
Remvoed comment
Jul 7, 2019
afd9933
Merge remote-tracking branch 'upstream/master' into newplatform/kbn-t…
Jul 8, 2019
5f71b4e
Update Query Bar defaults
Jul 8, 2019
86dbbbc
Top nav menu item tests
Jul 8, 2019
e6260ea
Moved storage instantiation to angular directive
Jul 8, 2019
ddcdda0
SearchBar jest tests
Jul 8, 2019
9a68d7a
Query bar additional tests
Jul 8, 2019
c2bc4d3
Top nav menu tests
Jul 8, 2019
144d8bb
Merge remote-tracking branch 'upstream/master' into newplatform/kbn-t…
Jul 8, 2019
247a4f7
Pass store into top nav menu correctly
Jul 9, 2019
e5fb6d8
watch store by reference
Jul 9, 2019
1856e8f
Merge remote-tracking branch 'upstream/master' into newplatform/kbn-t…
Jul 9, 2019
7786fa9
Added not null assertion
Jul 9, 2019
bcb6674
Make index patterns optional (for timepicker only setup)
Jul 9, 2019
60f1643
QueryBar tests again
Jul 9, 2019
d7b9941
Search bar tests
Jul 9, 2019
362d322
Top nav tests
Jul 9, 2019
01b359c
Top nav menu tests
Jul 9, 2019
541c813
removed unnecessary ui/new_platform mock
Jul 9, 2019
d7fe175
Merge remote-tracking branch 'upstream/master' into newplatform/kbn-t…
Jul 10, 2019
caad37f
Merge remote-tracking branch 'upstream/master' into newplatform/kbn-t…
Jul 11, 2019
5cac8c9
Moved discover result count away from top nav
Jul 11, 2019
3316b4a
Moved and improved top nav menu css
Jul 11, 2019
4d64d66
remove unused translations
Jul 11, 2019
0401c7f
Merge remote-tracking branch 'upstream/master' into newplatform/kbn-t…
Jul 14, 2019
df1f06d
Move timepicker (to be deprecated) into old kbn_top_nav
Jul 9, 2019
eaf21a7
Deleted search-bar and query-bar directives!
Jul 11, 2019
cef0742
moved search bar to kibana_react (it's a generic react component, not…
Jul 11, 2019
938c5c0
translations
Jul 11, 2019
83ff3c3
Moved superDatePicker directive to kbn_top_nav (to be deprecated)
Jul 11, 2019
50fc77f
Use index patterns from data plugin itself instead of importing from …
Jul 11, 2019
008bc6f
Pass uiSettings from top level of data plugin
Jul 13, 2019
abaa9dc
Pass saved objects client from top level
Jul 14, 2019
f5ad6ad
query bar input to rely on provided localStorage (?)
Jul 14, 2019
4dba9c2
import QueryBarInput correctly from vis ediror
Jul 14, 2019
2a91ea6
Query bar input tests - uiSettings
Jul 14, 2019
e95bbd2
Query bar - uiSettings tests
Jul 14, 2019
ff36393
import QueryBar from data plugin correctly
Jul 14, 2019
c9850b0
Use provider to pass config to TSVB query bar inputs
Jul 14, 2019
665007a
Add query bar input parms to agg types
Jul 14, 2019
90bbba4
Standardize shape data plugin and use it to pass uiSettings in.
Jul 15, 2019
573a8bc
Removed unnecessary mocks
Jul 15, 2019
d5e07ab
Merge remote-tracking branch 'upstream/master' into newplatform/kbn-t…
Jul 15, 2019
b14dd9f
Fixed test typo
Jul 15, 2019
ff59ab8
Merge remote-tracking branch 'upstream/master' into newplatform/kbn-t…
Jul 17, 2019
209797d
Code review part 1
Jul 17, 2019
37d7a98
Code review part 2 - clean up top nav menu item run interface
Jul 17, 2019
8729b57
Give top nav items better keys
Jul 17, 2019
d6f904f
Simplified top nav construction logic in editor
Jul 17, 2019
d6b1112
Merge branch 'newplatform/kbn-top-nav/new-directive' into newplatform…
Jul 17, 2019
c2ed904
Fixed mock of search bar in top nav test
Jul 17, 2019
c6f6ca5
Merge remote-tracking branch 'upstream/master' into newplatform/kbn-t…
Jul 17, 2019
8881518
Merge remote-tracking branch 'upstream/master' into newplatform/kbn-t…
Jul 17, 2019
0f41c0c
Merge branch 'newplatform/kbn-top-nav/new-directive' into newplatform…
Jul 18, 2019
d127cfd
Moved filter trigger button rendering to helper function
Jul 18, 2019
541a779
Remove responsiveness from top nav items
Jul 18, 2019
a6ba593
vertical align for cases where showSearchBarInline is true
Jul 18, 2019
f5ea79d
Export TopNavMenuData type
Jul 18, 2019
045efb0
Removed unused name attribute in top nav. Use app-name instead.
Jul 18, 2019
b8ff540
Merge branch 'newplatform/kbn-top-nav/new-directive' into newplatform…
Jul 18, 2019
0d34cd1
Merge branch 'newplatform/kbn-top-nav/new-directive-cleanup' into new…
Jul 18, 2019
66e85fc
Merge remote-tracking branch 'upstream/master' into newplatform/data-…
Jul 29, 2019
f9ced92
Minor merge fixes
Jul 29, 2019
5256b3b
Merge remote-tracking branch 'upstream/master' into newplatform/data-…
Jul 30, 2019
9f0133c
Update data plugin shape
Jul 30, 2019
672ed4f
Merge new-shape branch in
Jul 30, 2019
5569313
type fixes
Jul 30, 2019
bfefe9d
fix core start import
Jul 30, 2019
941e686
Merge remote-tracking branch 'upstream/master' into newplatform/data-…
Jul 30, 2019
a5680b1
Merge branch 'newplatform/data-plugin/new-shape' into newplatform/dat…
Jul 30, 2019
333d928
Fixed tests
Jul 30, 2019
b7691ea
Merge branch 'newplatform/data-plugin/new-shape' into newplatform/dat…
Jul 30, 2019
2d09451
fix another test mock
Jul 30, 2019
8797f63
Merge remote-tracking branch 'upstream/master' into newplatform/data-…
Jul 30, 2019
b8bde7e
Merge remote-tracking branch 'upstream/master' into newplatform/data-…
Jul 30, 2019
62f912b
Brought back setup.ts for backward compatibility.
Jul 30, 2019
dd558fd
bad import from data plugin
Jul 30, 2019
dfccf57
Yet another import :-(
Jul 30, 2019
5644e3d
Merge remote-tracking branch 'upstream/master' into newplatform/data-…
Jul 30, 2019
3959d82
Merge remote-tracking branch 'upstream/master' into newplatform/data-…
Jul 31, 2019
7989aa5
Code revire #1 @lukeelmers
Jul 31, 2019
e20b60c
Merge branch 'newplatform/data-plugin/new-shape' into newplatform/dat…
Jul 31, 2019
92ae0f1
create wrapper for QueryBarInput
alexwizp Jul 31, 2019
468db17
use IndexPatterns type
Aug 1, 2019
a0e7f23
import order
Aug 1, 2019
144203b
Merge branch 'newplatform/data-plugin/new-shape' into newplatform/dat…
Aug 1, 2019
5f415ab
Merge remote-tracking branch 'upstream/master' into newplatform/data-…
Aug 1, 2019
897fdd2
Changed context provider based on feedback from @alexwizp
Aug 1, 2019
445a583
Merge remote-tracking branch 'upstream/master' into newplatform/data-…
Aug 1, 2019
6391caa
Code review fixes
Aug 1, 2019
534df7a
Merge branch 'newplatform/data-plugin/new-shape' into newplatform/dat…
Aug 1, 2019
cf39c7f
inject uiSettings into filter-bar directive
Aug 1, 2019
a19a7fc
Merge remote-tracking branch 'upstream/master' into newplatform/data-…
Aug 1, 2019
569c41f
Fix some type errors
Aug 1, 2019
94151fe
Merge remote-tracking branch 'upstream/master' into newplatform/data-…
Aug 4, 2019
7fdf463
Fixes
Aug 4, 2019
62630de
Merge remote-tracking branch 'upstream/master' into newplatform/data-…
Aug 5, 2019
fb1d146
Merge remote-tracking branch 'upstream/master' into newplatform/data-…
Aug 6, 2019
2113aec
Filter bar context
Aug 6, 2019
0964435
ts CoreSetupContextProvider
Aug 6, 2019
bb20565
Moved coreCOntext to vis_editor constructor
Aug 6, 2019
66c81ac
Moved markdown to kibana_react shim plugin
Aug 6, 2019
a5010b7
Reverted filter bar context
Aug 6, 2019
0435723
Merge branch 'newplatform/data-plugin/data-plugin-deps' into newplatf…
Aug 6, 2019
0bc36fd
Removed unneeded scss import
Aug 6, 2019
145b4e3
Merge remote-tracking branch 'upstream/master' into newplatform/data-…
Aug 7, 2019
a194edb
Removed editor html ng-show
Aug 7, 2019
349499c
Merge remote-tracking branch 'upstream/master' into newplatform/kiban…
Aug 7, 2019
3ec4f72
Chnaged import paths back to root of kibana_react
Aug 7, 2019
a614864
Merge branch 'newplatform/data-plugin/data-plugin-deps' into newplatf…
Aug 7, 2019
ac616c2
Merge remote-tracking branch 'upstream/master' into newplatform/data-…
Aug 7, 2019
5f2599c
use saved objects contract + check uiSettings
Aug 7, 2019
40ce783
Merge branch 'newplatform/data-plugin/data-plugin-deps' into newplatf…
Aug 7, 2019
7e8766d
mock markdown in tests
Aug 7, 2019
8f52ff3
mock for another test
Aug 7, 2019
a454e47
Merge remote-tracking branch 'upstream/master' into newplatform/kiban…
Aug 11, 2019
5868b7d
Deleted unused css
Aug 12, 2019
a3c9dbe
Merge remote-tracking branch 'upstream/master' into newplatform/kiban…
Aug 13, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
import _ from 'lodash';
import { i18n } from '@kbn/i18n';
import React from 'react';
import { MarkdownSimple } from 'ui/markdown';
import { toastNotifications } from 'ui/notify';

import { fetchAnchorProvider } from '../api/anchor';
import { fetchContextProvider } from '../api/context';
import { QueryParameterActionsProvider } from '../query_parameters';
import { FAILURE_REASONS, LOADING_STATUS } from './constants';
import { MarkdownSimple } from '../../../../kibana_react/public';

export function QueryActionsProvider(Private, Promise) {
const fetchAnchor = Private(fetchAnchorProvider);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import React from 'react';
import PropTypes from 'prop-types';
import { Markdown } from 'ui/markdown/markdown';
import { Markdown } from '../../../../../kibana_react/public';

const whiteListedRules = ['backticks', 'emphasis', 'link', 'list'];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ import {
Content,
} from './content';


jest.mock('../../../../../kibana_react/public', () => {
return {
Markdown: () => <div className="markdown"/>,
};
});


test('should render content with markdown', () => {
const component = shallow(<Content
text={'I am *some* [content](https://en.wikipedia.org/wiki/Content) with `markdown`'}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
} from './instruction_set';
import * as StatusCheckStates from './status_check_states';


const instructions = [
{
title: 'step 1',
Expand All @@ -51,6 +52,12 @@ const instructionVariants = [
}
];

jest.mock('../../../../../kibana_react/public', () => {
return {
Markdown: () => <div className="markdown"/>,
};
});

test('render', () => {
const component = shallowWithIntl(<InstructionSet.WrappedComponent
title="title1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ import { shallowWithIntl } from 'test_utils/enzyme_helpers';

import { Introduction } from './introduction';

jest.mock('../../../../../kibana_react/public', () => {
return {
Markdown: () => <div className="markdown"/>,
};
});

test('render', () => {
const component = shallowWithIntl(<Introduction.WrappedComponent
description="this is a great tutorial about..."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ import {
Tutorial,
} from './tutorial';


jest.mock('../../../../../kibana_react/public', () => {
return {
Markdown: () => <div className="markdown"/>,
};
});

function buildInstructionSet(type) {
return {
instructionSets: [
Expand Down
2 changes: 2 additions & 0 deletions src/legacy/core_plugins/kibana_react/public/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import 'src/legacy/ui/public/styles/styling_constants';

@import './top_nav_menu/index';

@import './markdown/index';
2 changes: 2 additions & 0 deletions src/legacy/core_plugins/kibana_react/public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@

/** @public types */
export { TopNavMenu, TopNavMenuData } from './top_nav_menu';

export { Markdown, MarkdownSimple } from './markdown';
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
*/

export { MarkdownSimple } from './markdown_simple';
export { Markdown } from './markdown';
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import React from 'react';
import classNames from 'classnames';
import uuid from 'uuid';
import { get } from 'lodash';
import { Markdown } from 'ui/markdown/markdown';
import { Markdown } from '../../../../../kibana_react/public';

import { ErrorComponent } from '../../error';
import { replaceVars } from '../../lib/replace_vars';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { toastNotifications } from 'ui/notify';
import { MarkdownSimple } from 'ui/markdown';

import { tickFormatter } from '../../lib/tick_formatter';
import _ from 'lodash';
import { Timeseries } from '../../../visualizations/components/timeseries';
import { MarkdownSimple } from '../../../../../kibana_react/public';
import { replaceVars } from '../../lib/replace_vars';
import { getAxisLabelString } from '../../lib/get_axis_label_string';
import { getInterval } from '../../lib/get_interval';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ import React from 'react';
import { render, mount } from 'enzyme';
import { MarkdownVisWrapper } from './markdown_vis_controller';

// We need Markdown to do these tests, so mock data plugin
jest.mock('../../data/public', () => {
return {};
});

describe('markdown vis controller', () => {
it('should set html from markdown params', () => {
const vis = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

import React from 'react';
import { Markdown } from 'ui/markdown/markdown';
import { Markdown } from '../../kibana_react/public';
import { MarkdownVisParams } from './markdown_fn';

interface MarkdownVisComponentProps extends MarkdownVisParams {
Expand Down
1 change: 0 additions & 1 deletion src/legacy/ui/public/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
@import './exit_full_screen/index';
@import './field_editor/index';
@import './kbn_top_nav/index';
@import './markdown/index';
cchaos marked this conversation as resolved.
Show resolved Hide resolved
@import './notify/index';
@import './share/index';
@import './style_compile/index';
Expand Down
8 changes: 5 additions & 3 deletions src/legacy/ui/public/index_patterns/index_patterns.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,17 @@
*/

import { idx } from '@kbn/elastic-idx';
import { SavedObjectsClientContract, SimpleSavedObject } from 'src/core/public';
import {
SavedObjectsClientContract,
SimpleSavedObject,
UiSettingsClientContract,
} from 'src/core/public';
// @ts-ignore
import { fieldFormats } from '../registry/field_formats';

import { IndexPattern } from './_index_pattern';
import { createIndexPatternCache } from './_pattern_cache';
import { IndexPatternsApiClient } from './index_patterns_api_client';
import { UiSettingsClientContract } from '../../../../core/public';

const indexPatternCache = createIndexPatternCache();
const apiClient = new IndexPatternsApiClient();

Expand Down
2 changes: 1 addition & 1 deletion src/legacy/ui/public/notify/notify.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

import React from 'react';
import { MarkdownSimple } from 'ui/markdown';
import { MarkdownSimple } from '../../../core_plugins/kibana_react/public';
import chrome from '../chrome';
import { fatalError } from './fatal_error';
import { banners } from './banners';
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/ui/public/url/redirect_when_missing.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import React from 'react';
import { i18n } from '@kbn/i18n';
import { MarkdownSimple } from 'ui/markdown';
import { MarkdownSimple } from '../../../core_plugins/kibana_react/public/markdown';
import { toastNotifications } from 'ui/notify';
import { SavedObjectNotFound } from '../errors';
import { uiModules } from '../modules';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import React from 'react';
import { toastNotifications } from 'ui/notify';
import { MarkdownSimple } from 'ui/markdown';
import { MarkdownSimple } from '../../../../../../../src/legacy/core_plugins/kibana_react/public';
import { PLUGIN } from '../../../common/constants';

export class LogstashLicenseService {
Expand Down