[Fleet] Fix "Advanced options" toggle in policy editor always showing #154612
Conversation
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
jen-huang
added
release_note:fix
Team:Fleet
🤖 GitHub commentsExpand to view the GitHub comments
Just comment with:
|
Contributor
|
Pinging @elastic/fleet (Team:Fleet) |
💚 Build Succeeded
Metrics [docs]Async chunks
Unknown metric groupsESLint disabled line counts
Total ESLint disabled count
To update your PR or re-run it, just comment with: cc @jen-huang |
Contributor
💔 All backports failed
Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
jen-huang
added a commit
to jen-huang/kibana
that referenced
this pull request
Apr 11, 2023
…elastic#154612) ## Summary _Please review with [whitespace ignore](https://github.com/elastic/kibana/pull/154612/files?diff=unified&w=1)!_ In elastic#143097 the conditional for showing `Advanced options` was removed as we introduced experimental indexing toggles which are always shown. However in elastic#148418 (8.7) we put the indexing toggles behind a feature flag. This caused the `Advanced options` toggle to always be shown regardless of there is any content underneath. I spotted this while testing something unrelated. This PR fixes that by adding a condition back that is based on aggregating the conditionals of everything underneath (existence of advanced vars, whether pipelines & mappings are shown, and if experimental indexing toggles are enabled). (cherry picked from commit 2636262) # Conflicts: # x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/package_policy_input_stream.tsx
jen-huang
added a commit
that referenced
this pull request
Apr 11, 2023
…howing (#154612) (#154784) # Backport This will backport the following commits from `main` to `8.7`: - [[Fleet] Fix "Advanced options" toggle in policy editor always showing (#154612)](#154612) <!--- Backport version: 8.9.7 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Jen Huang","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-04-11T18:32:05Z","message":"[Fleet] Fix \"Advanced options\" toggle in policy editor always showing (#154612)\n\n## Summary\r\n\r\n_Please review with [whitespace\r\nignore](https://github.com/elastic/kibana/pull/154612/files?diff=unified&w=1)!_\r\n\r\nIn #143097 the conditional for showing `Advanced options` was removed as\r\nwe introduced experimental indexing toggles which are always shown.\r\nHowever in #148418 (8.7) we put the indexing toggles behind a feature\r\nflag. This caused the `Advanced options` toggle to always be shown\r\nregardless of there is any content underneath. I spotted this while\r\ntesting something unrelated.\r\n\r\nThis PR fixes that by adding a condition back that is based on\r\naggregating the conditionals of everything underneath (existence of\r\nadvanced vars, whether pipelines & mappings are shown, and if\r\nexperimental indexing toggles are enabled).","sha":"2636262e093f188e4937d192d302607eeaafff85","branchLabelMapping":{"^v8.8.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","backport:prev-minor","v8.8.0"],"number":154612,"url":"https://github.com/elastic/kibana/pull/154612","mergeCommit":{"message":"[Fleet] Fix \"Advanced options\" toggle in policy editor always showing (#154612)\n\n## Summary\r\n\r\n_Please review with [whitespace\r\nignore](https://github.com/elastic/kibana/pull/154612/files?diff=unified&w=1)!_\r\n\r\nIn #143097 the conditional for showing `Advanced options` was removed as\r\nwe introduced experimental indexing toggles which are always shown.\r\nHowever in #148418 (8.7) we put the indexing toggles behind a feature\r\nflag. This caused the `Advanced options` toggle to always be shown\r\nregardless of there is any content underneath. I spotted this while\r\ntesting something unrelated.\r\n\r\nThis PR fixes that by adding a condition back that is based on\r\naggregating the conditionals of everything underneath (existence of\r\nadvanced vars, whether pipelines & mappings are shown, and if\r\nexperimental indexing toggles are enabled).","sha":"2636262e093f188e4937d192d302607eeaafff85"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.8.0","labelRegex":"^v8.8.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/154612","number":154612,"mergeCommit":{"message":"[Fleet] Fix \"Advanced options\" toggle in policy editor always showing (#154612)\n\n## Summary\r\n\r\n_Please review with [whitespace\r\nignore](https://github.com/elastic/kibana/pull/154612/files?diff=unified&w=1)!_\r\n\r\nIn #143097 the conditional for showing `Advanced options` was removed as\r\nwe introduced experimental indexing toggles which are always shown.\r\nHowever in #148418 (8.7) we put the indexing toggles behind a feature\r\nflag. This caused the `Advanced options` toggle to always be shown\r\nregardless of there is any content underneath. I spotted this while\r\ntesting something unrelated.\r\n\r\nThis PR fixes that by adding a condition back that is based on\r\naggregating the conditionals of everything underneath (existence of\r\nadvanced vars, whether pipelines & mappings are shown, and if\r\nexperimental indexing toggles are enabled).","sha":"2636262e093f188e4937d192d302607eeaafff85"}}]}] BACKPORT--> --------- Co-authored-by: kibanamachine <[email protected]>
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.
Summary
Please review with whitespace ignore!
In #143097 the conditional for showing
Advanced optionswas removed as we introduced experimental indexing toggles which are always shown. However in #148418 (8.7) we put the indexing toggles behind a feature flag. This caused theAdvanced optionstoggle to always be shown regardless of there is any content underneath. I spotted this while testing something unrelated.This PR fixes that by adding a condition back that is based on aggregating the conditionals of everything underneath (existence of advanced vars, whether pipelines & mappings are shown, and if experimental indexing toggles are enabled).