Convert default_watch.json to a JS object in order to avoid TS complaints#89488
Merged
cjcenizal merged 2 commits intoelastic:masterfrom Jan 28, 2021
Merged
Conversation
Contributor
|
Pinging @elastic/es-ui (Team:Elasticsearch UI) |
cjcenizal
commented
Jan 27, 2021
| } | ||
|
|
||
| static defaultWatchJson = defaultWatchJson; | ||
| static defaultWatch = defaultWatch; |
Contributor
Author
There was a problem hiding this comment.
Reviewers, I need to do a quick grep and see if this renaming will cause any problems.
Contributor
Author
There was a problem hiding this comment.
Looks like this isn't referenced anywhere in the codebase, so I removed it.
alisonelizabeth
approved these changes
Jan 27, 2021
Contributor
alisonelizabeth
left a comment
There was a problem hiding this comment.
Code LGTM. Verified locally. Thanks for addressing this!
Contributor
There was a problem hiding this comment.
I'll pull this into the branch for migrating watcher to a TS project and give feedback thereafter.
LGTM from a code POV. I haven't run the code.
Not directly related to this work but still needed for migrating the plugin: could we type WATCH explicitly please? ATM, the TS project build throws an error for that.
TinaHeiligers
approved these changes
Jan 27, 2021
Contributor
There was a problem hiding this comment.
I pulled the code into the branch for converting watcher to a TS project and it solves the issue of the .json file. The only other issue is:
Exported variable 'WATCH' has or is using name 'Watch' from external module "/Users/christianeheiligers/Projects/kibana/x-pack/plugins/watcher/__fixtures__/watch" but cannot be named.
11 export const WATCH = { watch: getWatch({ id: WATCH_ID }) };
but I could get around that with:
export const WATCH: any = { watch: getWatch({ id: WATCH_ID }) };
LGTM!
Contributor
Author
|
Thanks @TinaHeiligers I'll let you make that change in your PR so that the related changes are made in a single commit. |
jloleysens
added a commit
to jloleysens/kibana
that referenced
this pull request
Jan 28, 2021
…y-tests * 'master' of github.com:elastic/kibana: (31 commits) [Discover] Add grid flyout jest test (elastic#89088) [Search Sessions] Improve session restoration back button (elastic#87635) [TSVB] Remove vis_type_timeseries_enhanced plugin (elastic#89274) [Security Solution] Init Osquery plugin (elastic#87109) [Fleet] Do not defined aliases inside datastream template (elastic#89512) skip flaky suite (elastic#86950) chore(NA): bazel machinery installation on kbn bootstrap (elastic#89469) [build/docker] Add support for centos ARM builds (elastic#84831) Convert default_watch.json to a JS object in order to avoid TS complaints (elastic#89488) [CI] Decrease number of Jest workers (elastic#89504) [Maps] remove maps_oss TS project (elastic#89502) Adds migration settings to Docker (elastic#89501) [Lens] Fix crash in transition from unique count to last value (elastic#88916) [kbn-es] Always use bundled JDK when starting Elasticsearch (elastic#89437) unskip getting_started/shakespeare test elasticsearch 64016 (elastic#89346) [Maps] migrate maps, maps_file_upload, and maps_legacy_licensing to TS projects (elastic#89439) skip flaky suite (elastic#89478) skip flaky suite (elastic#89476) skip flaky suite (elastic#89477) skip flaky suite (elastic#89475) ... # Conflicts: # x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx
jloleysens
added a commit
to jloleysens/kibana
that referenced
this pull request
Jan 28, 2021
…updates-and-timeline-cleanup * 'master' of github.com:elastic/kibana: (44 commits) [Discover] Add grid flyout jest test (elastic#89088) [Search Sessions] Improve session restoration back button (elastic#87635) [TSVB] Remove vis_type_timeseries_enhanced plugin (elastic#89274) [Security Solution] Init Osquery plugin (elastic#87109) [Fleet] Do not defined aliases inside datastream template (elastic#89512) skip flaky suite (elastic#86950) chore(NA): bazel machinery installation on kbn bootstrap (elastic#89469) [build/docker] Add support for centos ARM builds (elastic#84831) Convert default_watch.json to a JS object in order to avoid TS complaints (elastic#89488) [CI] Decrease number of Jest workers (elastic#89504) [Maps] remove maps_oss TS project (elastic#89502) Adds migration settings to Docker (elastic#89501) [Lens] Fix crash in transition from unique count to last value (elastic#88916) [kbn-es] Always use bundled JDK when starting Elasticsearch (elastic#89437) unskip getting_started/shakespeare test elasticsearch 64016 (elastic#89346) [Maps] migrate maps, maps_file_upload, and maps_legacy_licensing to TS projects (elastic#89439) skip flaky suite (elastic#89478) skip flaky suite (elastic#89476) skip flaky suite (elastic#89477) skip flaky suite (elastic#89475) ... # Conflicts: # x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx # x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves #89321 (comment), which is blocking TS project migration of the watcher plugin.
To test, create an Advanced Watch in Watcher and verify that it is prepopulated with watch JSON.