Skip to content

[TSVB] Markdown variables should be clickable #108844

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.

Sign up for GitHub

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

Merged
alexwizp merged 2 commits into from
Aug 17, 2021
Merged

[TSVB] Markdown variables should be clickable #108844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2728f24
[TSVB] Markdown variables should be clickable
alexwizp Aug 17, 2021
3e09359
fix test
alexwizp Aug 17, 2021
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
16 changes: 9 additions & 7 deletions src/plugins/vis_type_timeseries/public/application/components/markdown_editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,17 @@ export class MarkdownEditor extends Component {
this.props.onChange({ markdown: value });
};

handleOnLoad = (ace) => {
this.ace = ace;
handleOnLoad = (editor) => {
this.editor = editor;
};

handleVarClick(snippet) {
return () => {
if (this.ace) this.ace.insert(snippet);
};
}
handleVarClick = (snippet) => () => {
if (this.editor) {
const range = this.editor.getSelection();

this.editor.executeEdits('', [{ range, text: snippet }]);
}
};

render() {
const { visData, model, getConfig } = this.props;
Expand Down
12 changes: 11 additions & 1 deletion test/functional/apps/visualize/_tsvb_markdown.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ import expect from '@kbn/expect';
import { FtrProviderContext } from '../../ftr_provider_context';

export default function ({ getPageObjects, getService }: FtrProviderContext) {
const { visualBuilder, timePicker, visualize } = getPageObjects([
const { visualBuilder, timePicker, visualize, visChart } = getPageObjects([
'visualBuilder',
'timePicker',
'visualize',
'visChart',
]);
const retry = getService('retry');

Expand Down Expand Up @@ -76,6 +77,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
expect(markdownText).to.be(html);
});

it('markdown variables should be clickable', async () => {
await visualBuilder.clearMarkdown();
const [firstVariable] = await visualBuilder.getMarkdownTableVariables();
await firstVariable.selector.click();
await visChart.waitForVisualizationRenderingStabilized();
const markdownText = await visualBuilder.getMarkdownText();
expect(markdownText).to.be('46');
});

it('should render mustache list', async () => {
const list = '{{#each _all}}\n{{ data.formatted.[0] }} {{ data.raw.[0] }}\n{{/each}}';
const expectedRenderer = 'Sep 22, 2015 @ 06:00:00.000,6 1442901600000,6';
Expand Down