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

[7.x] [Console] Move out of quarantined (#52270) #52624

Merged
merged 1 commit into from
Dec 10, 2019
Merged
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
[Console] Move out of quarantined (#52270)
* WiP, lotta broken things, working through new editor.ts

* RowParser -> TS

* Utils to TS and regular module

* Finished first version of core & sense editor wrappers. Tokenizer provider test working. Still need to delete some files

* WiP - moved A LOT of code around and busy fixing sense-editor tests

* Fix sense editor test

* Clean up mocks

* Moved A LOT of code out of quarantined.
Still working on sense editor's integration test
Not running yet.

* WiP still finishing up manual testing

* Fix use of Ace Range and fix open documentation

* Move out of quarantined!

* Remove load remote editor state for now

* - fix use of token iterator
- remove ace ranges from sense editor spec and fix spec 🤦

* Address getSelectionRange document TODO
Clean up use of jquery
Remove use of `done` inside async tests (input_tokenization.test.js)
Capitalize elasticsearch
Introduce helper for converting to AceRange inside legacy core editor
Update typings
Clean up imports
Cleaner variable assignment

* Update src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/curl.ts

Co-Authored-By: Rory Hunter <[email protected]>

* Remove commented-out code
lib/utils.js -> lib/utils.ts
Rename engulfling range (sense_editor)

* Rename format request function

* utils.ts default export usage cleanup

* Update replace regex and add another utils test

* Remove legacy replace behaviour

* Fix typo in comment
  • Loading branch information
jloleysens committed Dec 10, 2019
commit ce7a24e8ee7edbf7859f17e3de8e8c7317e3de74
18 changes: 5 additions & 13 deletions src/legacy/core_plugins/console/index.ts
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@

import Boom from 'boom';
import { first } from 'rxjs/operators';
import { resolve, join, sep } from 'path';
import { resolve, join } from 'path';
import url from 'url';
import { has, isEmpty, head, pick } from 'lodash';

@@ -51,9 +51,7 @@ function filterHeaders(originalHeaders: any, headersToKeep: any) {

// eslint-disable-next-line
export default function(kibana: any) {
const modules = resolve(__dirname, 'public/webpackShims/');
const quarantinedSrc = resolve(__dirname, 'public/quarantined/src/');
const npSrc = resolve(__dirname, 'np_ready/public');
const npSrc = resolve(__dirname, 'public/np_ready');

let defaultVars: any;
return new kibana.Plugin({
@@ -180,16 +178,10 @@ export default function(kibana: any) {
},

uiExports: {
devTools: [`${npSrc}/legacy`],
styleSheetPaths: resolve(__dirname, 'public/quarantined/index.scss'),

devTools: [resolve(__dirname, 'public/legacy')],
styleSheetPaths: resolve(npSrc, 'application/styles/index.scss'),
injectDefaultVars: () => defaultVars,

noParse: [
join(modules, 'ace' + sep),
join(modules, 'moment_src/moment' + sep),
join(quarantinedSrc, 'sense_editor/mode/worker.js'),
],
noParse: [join(npSrc, 'application/models/legacy_core_editor/mode/worker/worker.js')],
},
} as any);
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading