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

[8.x] [Search profiler] Migrate ace to monaco (#195343) #195724

Merged
merged 1 commit into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -3,5 +3,4 @@ $badgeSize: $euiSize * 5.5;
@import 'highlight_details_flyout/highlight_details_flyout';
@import 'license_warning_notice/license_warning_notice';
@import 'percentage_badge/percentage_badge';
@import 'profile_query_editor/profile_query_editor';
@import 'profile_tree/index';

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,14 @@
* 2.0.
*/

import 'brace';
import 'brace/mode/json';

import { coreMock } from '@kbn/core/public/mocks';
import { registerTestBed } from '@kbn/test-jest-helpers';
import { Editor, Props } from './editor';

const coreStart = coreMock.createStart();

describe('Editor Component', () => {
it('renders', async () => {
const props: Props = {
...coreStart,
initialValue: '',
editorValue: '',
setEditorValue: () => {},
licenseEnabled: true,
onEditorReady: (e: any) => {},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,67 +5,37 @@
* 2.0.
*/

import React, { memo, useRef, useEffect, useState } from 'react';
import React, { memo, useCallback } from 'react';
import { i18n } from '@kbn/i18n';
import { EuiScreenReaderOnly } from '@elastic/eui';
import { Editor as AceEditor } from 'brace';
import { EuiScreenReaderOnly, EuiSpacer } from '@elastic/eui';
import { CodeEditor } from '@kbn/code-editor';
import { monaco, XJsonLang } from '@kbn/monaco';

import { SearchProfilerStartServices } from '../../../../types';
import { ace } from '../../../../shared_imports';
import { initializeEditor } from './init_editor';

const { useUIAceKeyboardMode } = ace;

type EditorShim = ReturnType<typeof createEditorShim>;

export type EditorInstance = EditorShim;

export interface Props extends SearchProfilerStartServices {
export interface Props {
licenseEnabled: boolean;
initialValue: string;
onEditorReady: (editor: EditorShim) => void;
editorValue: string;
setEditorValue: (value: string) => void;
onEditorReady: (props: EditorProps) => void;
}

const createEditorShim = (aceEditor: AceEditor) => {
return {
getValue() {
return aceEditor.getValue();
},
focus() {
aceEditor.focus();
},
};
};

const EDITOR_INPUT_ID = 'SearchProfilerTextArea';

export const Editor = memo(
({ licenseEnabled, initialValue, onEditorReady, ...startServices }: Props) => {
const containerRef = useRef<HTMLDivElement>(null as any);
const editorInstanceRef = useRef<AceEditor>(null as any);

const [textArea, setTextArea] = useState<HTMLTextAreaElement | null>(null);

useUIAceKeyboardMode(textArea, startServices);

useEffect(() => {
const divEl = containerRef.current;
editorInstanceRef.current = initializeEditor({ el: divEl, licenseEnabled });
editorInstanceRef.current.setValue(initialValue, 1);
const textarea = divEl.querySelector<HTMLTextAreaElement>('textarea');
if (textarea) {
textarea.setAttribute('id', EDITOR_INPUT_ID);
}
setTextArea(licenseEnabled ? containerRef.current!.querySelector('textarea') : null);

onEditorReady(createEditorShim(editorInstanceRef.current));
export interface EditorProps {
focus: () => void;
}

return () => {
if (editorInstanceRef.current) {
editorInstanceRef.current.destroy();
}
};
}, [initialValue, onEditorReady, licenseEnabled]);
export const Editor = memo(
({ licenseEnabled, editorValue, setEditorValue, onEditorReady }: Props) => {
const editorDidMountCallback = useCallback(
(editor: monaco.editor.IStandaloneCodeEditor) => {
onEditorReady({
focus: () => {
editor.focus();
},
} as EditorProps);
},
[onEditorReady]
);

return (
<>
Expand All @@ -76,7 +46,26 @@ export const Editor = memo(
})}
</label>
</EuiScreenReaderOnly>
<div data-test-subj="searchProfilerEditor" ref={containerRef} />

<EuiSpacer size="m" />
<CodeEditor
languageId={XJsonLang.ID}
dataTestSubj="searchProfilerEditor"
value={editorValue}
editorDidMount={editorDidMountCallback}
options={{
readOnly: !licenseEnabled,
lineNumbers: 'on',
tabSize: 2,
automaticLayout: true,
overviewRulerLanes: 0,
}}
aria-label={i18n.translate('xpack.searchProfiler.editor.queryEditor', {
defaultMessage: 'Query editor',
})}
onChange={setEditorValue}
/>
<EuiSpacer size="m" />
</>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@
* 2.0.
*/

export type { EditorInstance } from './editor';
export { Editor } from './editor';
export { Editor, type EditorProps } from './editor';

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import React, { useRef, memo, useCallback } from 'react';
import React, { useRef, memo, useCallback, useState } from 'react';
import { i18n } from '@kbn/i18n';
import {
EuiForm,
Expand All @@ -23,7 +23,7 @@ import { decompressFromEncodedURIComponent } from 'lz-string';
import { useRequestProfile } from '../../hooks';
import { useAppContext } from '../../contexts/app_context';
import { useProfilerActionContext } from '../../contexts/profiler_context';
import { Editor, EditorInstance } from './editor';
import { Editor, type EditorProps } from './editor';

const DEFAULT_INDEX_VALUE = '_all';

Expand All @@ -39,33 +39,36 @@ const INITIAL_EDITOR_VALUE = `{
* Drives state changes for mine via profiler action context.
*/
export const ProfileQueryEditor = memo(() => {
const editorRef = useRef<EditorInstance>(null as any);
const editorPropsRef = useRef<EditorProps>(null as any);
const indexInputRef = useRef<HTMLInputElement>(null as any);

const dispatch = useProfilerActionContext();

const { getLicenseStatus, notifications, location, ...startServices } = useAppContext();
const { getLicenseStatus, notifications, location } = useAppContext();

const queryParams = new URLSearchParams(location.search);
const indexName = queryParams.get('index');
const searchProfilerQueryURI = queryParams.get('load_from');

const searchProfilerQuery =
searchProfilerQueryURI &&
decompressFromEncodedURIComponent(searchProfilerQueryURI.replace(/^data:text\/plain,/, ''));
const [editorValue, setEditorValue] = useState(
searchProfilerQuery ? searchProfilerQuery : INITIAL_EDITOR_VALUE
);

const requestProfile = useRequestProfile();

const handleProfileClick = async () => {
dispatch({ type: 'setProfiling', value: true });
try {
const { current: editor } = editorRef;
const { data: result, error } = await requestProfile({
query: editorRef.current.getValue(),
query: editorValue,
index: indexInputRef.current.value,
});
if (error) {
notifications.addDanger(error);
editor.focus();
editorPropsRef.current.focus();
return;
}
if (result === null) {
Expand All @@ -78,18 +81,13 @@ export const ProfileQueryEditor = memo(() => {
};

const onEditorReady = useCallback(
(editorInstance: any) => (editorRef.current = editorInstance),
(editorPropsInstance: EditorProps) => (editorPropsRef.current = editorPropsInstance),
[]
);
const licenseEnabled = getLicenseStatus().valid;

return (
<EuiFlexGroup
responsive={false}
className="prfDevTool__sense"
gutterSize="none"
direction="column"
>
<EuiFlexGroup responsive={false} gutterSize="none" direction="column">
{/* Form */}
<EuiFlexItem grow={false}>
<EuiForm>
Expand Down Expand Up @@ -120,9 +118,9 @@ export const ProfileQueryEditor = memo(() => {
<EuiFlexItem grow={10}>
<Editor
onEditorReady={onEditorReady}
setEditorValue={setEditorValue}
editorValue={editorValue}
licenseEnabled={licenseEnabled}
initialValue={searchProfilerQuery ? searchProfilerQuery : INITIAL_EDITOR_VALUE}
{...startServices}
/>
</EuiFlexItem>

Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/searchprofiler/public/shared_imports.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@
* 2.0.
*/

export { ace } from '@kbn/es-ui-shared-plugin/public';

export { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render';
3 changes: 2 additions & 1 deletion x-pack/plugins/searchprofiler/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@
"@kbn/expect",
"@kbn/test-jest-helpers",
"@kbn/i18n-react",
"@kbn/ace",
"@kbn/config-schema",
"@kbn/react-kibana-context-render",
"@kbn/code-editor",
"@kbn/monaco",
],
"exclude": [
"target/**/*",
Expand Down
6 changes: 3 additions & 3 deletions x-pack/test/accessibility/apps/group1/search_profiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ getService, getPageObjects }: FtrProviderContext) {
const PageObjects = getPageObjects(['common', 'security']);
const testSubjects = getService('testSubjects');
const aceEditor = getService('aceEditor');
const monacoEditor = getService('monacoEditor');
const a11y = getService('a11y');
const esArchiver = getService('esArchiver');

Expand All @@ -27,7 +27,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
});

it('input the JSON in the aceeditor', async () => {
it('input the JSON in the editor', async () => {
const input = {
query: {
bool: {
Expand All @@ -54,7 +54,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
},
};

await aceEditor.setValue('searchProfilerEditor', JSON.stringify(input));
await monacoEditor.setCodeEditorValue(JSON.stringify(input), 0);
await a11y.testAppSnapshot();
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
`parser errors to match expectation: HAS ${expectation ? 'ERRORS' : 'NO ERRORS'}`,
async () => {
const actual = await PageObjects.searchProfiler.editorHasParseErrors();
return expectation === actual;
return expectation === actual?.length > 0;
}
);
}
Expand Down
Loading