[ML] Transform: Support multi-line JSON notation in advanced editor #58015

darnautov · 2020-02-19T14:46:22Z

Summary

Resolves #41870. Provides XJsonMode to EuiCodeEditor which allows indenting painless code wrapped with """.

Checklist

Unit or functional tests were updated or added to match the most common scenarios
This was checked for keyboard-only and screenreader accessibility
This was checked for cross-browser compatibility, including a check against IE11

elasticmachine · 2020-02-19T14:46:25Z

Pinging @elastic/ml-ui (:ml)

walterra

Code LGTM, I'd just like to give this a local test too!

...s/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx

jgowdyelastic · 2020-02-19T15:07:15Z

x-pack/legacy/plugins/transform/public/shared_imports.ts

@@ -37,3 +37,5 @@ export { setDependencyCache } from '../../ml/public/application/util/dependency_

 // @ts-ignore: could not find declaration file for module
 export { KqlFilterBar } from '../../ml/public/application/components/kql_filter_bar';
+
+export { useXJsonMode } from '../../../../plugins/watcher/public/application/sections/watch_edit/components/json_watch_edit/use_x_json_mode';


i wonder if it’s worth making a copy of use_x_json_mode
deep including from other x-pack plugins isn’t recommended, plus watcher isn't long for this world as kibana alerts are on the horizon.

I agree we should copy the file. The inner imports of that file are more obvious to reimport because they come from the es_ui_shared folder.

Done in 031023a

walterra · 2020-02-20T09:54:39Z

Noticed the following: Copy pasting multi-line examples with script works now, great!

I noticed though when clicking "Apply changes" we auto-enforce code formatting which then makes the multi-line scripts become single-line:

I liked the auto-formatting in earlier versions but I think that's not useful here anymore. Do you agree we should disable it?

darnautov · 2020-02-20T11:07:55Z

@walterra I disabled JSON formatting in 031023a

walterra

Latest changes LGTM!

jgowdyelastic

LGTM

darnautov · 2020-02-21T07:46:01Z

@elasticmachine merge upstream

kibanamachine · 2020-02-21T16:39:46Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request
Commit: 9e3d5d8

History

💚 Build #28122 succeeded c918df6
💔 Build #28075 failed 7d07b97
💚 Build #27892 succeeded c64582d
💔 Build #27847 failed 031023a

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

…lastic#58015) * [ML] use xJsonMode * [ML] remove commented code * [ML] move use_x_json_mode hook, disable json formatting * [ML] mocks for shared_imports * [ML] ts-ignore worker import

…_improve-advanced-settings-save * commit '02efb01c481f9f24d8d707f06dfc68b2fb805001': (43 commits) [Endpoint] Add a flyout to alert list. (elastic#57926) Make sure index pattern has fields before parsing (elastic#58242) Sanitize workpad before sending to API (elastic#57704) [ML] Transform: Support multi-line JSON notation in advanced editor (elastic#58015) [Endpoint] Refactor Management List Tests (elastic#58148) [kbn/optimizer] include bootstrap cache key in optimizer cache key (elastic#58176) Do not refresh color scale on each lookup (elastic#57792) Updating to @elastic/lodash@3.10.1-kibana4 (elastic#54662) Trigger context (elastic#57870) [ML] Transforms: Adds clone feature to transforms list. (elastic#57837) [ML] New Platform server shim: update fields service routes (elastic#58060) [Endpoint] EMT-184: change endpoints to metadata up and down the code base. (elastic#58038) document difference between log record formats (elastic#57798) Expose elasticsearch config schema (elastic#57655) [ui/agg_response/tabify] update types for search/expressions/build_tabular_inspector_data.ts (elastic#58130) [SIEM] Cleans Cypress tests code (elastic#58134) fix: 🐛 make dev server Storybook builds work again (elastic#58188) Prevent core savedObjects plugin from being overridden (elastic#58193) Expose serverBasePath on client-side (elastic#58070) Fix legend sizing on area charts (elastic#58083) ...

…itor (#58015) (#58239) * [ML] Transform: Support multi-line JSON notation in advanced editor (#58015) * [ML] use xJsonMode * [ML] remove commented code * [ML] move use_x_json_mode hook, disable json formatting * [ML] mocks for shared_imports * [ML] ts-ignore worker import * [ML] remove unused imports

…-out-of-legacy * 'master' of github.com:elastic/kibana: [SIEM] [Case] Enable case by default. Snake to camel on UI (elastic#57936) [File upload] Update remaining File Upload dependencies for NP migration (elastic#58128) Use EuiTokens for ES field types (elastic#57911) Added UI support for the default action group for Alert Type Model (elastic#57603) force savedObject API consumers to define SO type explicitly (elastic#58022) Update dependency @elastic/charts to ^17.1.1 (elastic#57634) [Endpoint] Add a flyout to alert list. (elastic#57926) Make sure index pattern has fields before parsing (elastic#58242) Sanitize workpad before sending to API (elastic#57704) [ML] Transform: Support multi-line JSON notation in advanced editor (elastic#58015) [Endpoint] Refactor Management List Tests (elastic#58148) [kbn/optimizer] include bootstrap cache key in optimizer cache key (elastic#58176) Do not refresh color scale on each lookup (elastic#57792) Updating to @elastic/lodash@3.10.1-kibana4 (elastic#54662) Trigger context (elastic#57870) [ML] Transforms: Adds clone feature to transforms list. (elastic#57837) [ML] New Platform server shim: update fields service routes (elastic#58060) [Endpoint] EMT-184: change endpoints to metadata up and down the code base. (elastic#58038)

Fixes regression introduced by #58015 to correctly initialize the transform wizard advanced editor with the current configuration.

Fixes regression introduced by elastic#58015 to correctly initialize the transform wizard advanced editor with the current configuration.

Fixes regression introduced by #58015 to correctly initialize the transform wizard advanced editor with the current configuration.

Fixes regression introduced by elastic#58015 to correctly initialize the transform wizard advanced editor with the current configuration.

darnautov added release_note:enhancement :ml v8.0.0 Feature:Transforms ML transforms v7.7.0 labels Feb 19, 2020

darnautov requested review from walterra and jgowdyelastic February 19, 2020 14:46

darnautov requested a review from a team as a code owner February 19, 2020 14:46

darnautov self-assigned this Feb 19, 2020

walterra reviewed Feb 19, 2020

View reviewed changes

...s/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx Outdated Show resolved Hide resolved

jgowdyelastic reviewed Feb 19, 2020

View reviewed changes

darnautov added 2 commits February 20, 2020 10:44

[ML] use xJsonMode

ae08bd0

[ML] remove commented code

e94c903

[ML] move use_x_json_mode hook, disable json formatting

031023a

darnautov force-pushed the ML-41870-advanced-editor-enhancements branch from a78c952 to 031023a Compare February 20, 2020 11:06

darnautov requested review from jgowdyelastic and walterra February 20, 2020 11:08

walterra approved these changes Feb 20, 2020

View reviewed changes

jgowdyelastic approved these changes Feb 20, 2020

View reviewed changes

[ML] mocks for shared_imports

c64582d

elasticmachine and others added 3 commits February 21, 2020 02:46

Merge branch 'master' into ML-41870-advanced-editor-enhancements

7d07b97

[ML] ts-ignore worker import

c918df6

Merge branch 'master' into ML-41870-advanced-editor-enhancements

9e3d5d8

darnautov merged commit 3d9eb2a into elastic:master Feb 21, 2020

darnautov deleted the ML-41870-advanced-editor-enhancements branch February 21, 2020 16:45

darnautov mentioned this pull request Feb 21, 2020

[7.x] [ML] Transform: Support multi-line JSON notation in advanced editor (#58015) #58239

Merged

walterra mentioned this pull request Mar 2, 2020

[ML] Transform: Fix advanced editor initialization. #59006

Merged

3 tasks

walterra added a commit that referenced this pull request Mar 3, 2020

[ML] Transform: Fix advanced editor initialization. (#59006)

ecbcceb

Fixes regression introduced by #58015 to correctly initialize the transform wizard advanced editor with the current configuration.

walterra added a commit that referenced this pull request Mar 3, 2020

[ML] Transform: Fix advanced editor initialization. (#59006) (#59114)

5a41051

Fixes regression introduced by #58015 to correctly initialize the transform wizard advanced editor with the current configuration.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ML] Transform: Support multi-line JSON notation in advanced editor #58015

[ML] Transform: Support multi-line JSON notation in advanced editor #58015

darnautov commented Feb 19, 2020 •

edited

Loading

elasticmachine commented Feb 19, 2020

walterra left a comment

jgowdyelastic Feb 19, 2020

walterra Feb 20, 2020

darnautov Feb 20, 2020

walterra commented Feb 20, 2020

darnautov commented Feb 20, 2020

walterra left a comment

jgowdyelastic left a comment

darnautov commented Feb 21, 2020

kibanamachine commented Feb 21, 2020

[ML] Transform: Support multi-line JSON notation in advanced editor #58015

[ML] Transform: Support multi-line JSON notation in advanced editor #58015

Conversation

darnautov commented Feb 19, 2020 • edited Loading

Summary

Checklist

elasticmachine commented Feb 19, 2020

walterra left a comment

Choose a reason for hiding this comment

jgowdyelastic Feb 19, 2020

Choose a reason for hiding this comment

walterra Feb 20, 2020

Choose a reason for hiding this comment

darnautov Feb 20, 2020

Choose a reason for hiding this comment

walterra commented Feb 20, 2020

darnautov commented Feb 20, 2020

walterra left a comment

Choose a reason for hiding this comment

jgowdyelastic left a comment

Choose a reason for hiding this comment

darnautov commented Feb 21, 2020

kibanamachine commented Feb 21, 2020

💚 Build Succeeded

History

darnautov commented Feb 19, 2020 •

edited

Loading