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

[Security Assistant] Show license upgrade CTA within new flyout #183576

Merged
merged 3 commits into from
May 16, 2024

Conversation

spong
Copy link
Member

@spong spong commented May 15, 2024

Summary

This is a fix for showing the license upgrade CTA when using the new flyout experience with the Security Assistant.

To test, downgrade your license from trial to basic in Stack Management and view that the CTA is now back.

The New Chat and Expand Conversations button are now also disabled if !isAssistantAvailable.

Note

No logic around determining if the assistant should be shown has changed, so all existing tests around assistantAvailability are still in place and relevant. This was a surgical fix, and we short-circuit to show this UI if !isAssistantAvailable.

This is a functional change to ESS only, as Serverless completely hides the assistant when unavailable (essentials productTier) as originally implemented in #164763.

Before / After:

@spong spong added bug Fixes for quality problems that affect the customer experience release_note:skip Skip the PR/issue when compiling release notes Team: SecuritySolution Security Solutions Team working on SIEM, Endpoint, Timeline, Resolver, etc. Feature:Security Assistant Security Assistant v8.14.0 v8.15.0 labels May 15, 2024
@spong spong self-assigned this May 15, 2024
@spong spong requested a review from a team as a code owner May 15, 2024 23:10
@elasticmachine
Copy link
Contributor

Pinging @elastic/security-solution (Team: SecuritySolution)

@kibana-ci
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] FTR Configs #43 / lens app - group 6 lens reporting PDF report should be able to download report of the current visualization

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
securitySolution 15.1MB 15.1MB +1.1KB

History

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

cc @spong

Copy link
Contributor

@patrykkopycinski patrykkopycinski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @spong 🙇

@patrykkopycinski patrykkopycinski merged commit dff2d29 into elastic:main May 16, 2024
35 checks passed
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request May 16, 2024
…tic#183576)

## Summary

This is a fix for showing the license upgrade CTA when using the new
flyout experience with the Security Assistant.

To test, downgrade your license from `trial` to `basic` in Stack
Management and view that the CTA is now back.

The `New Chat` and `Expand Conversations` button are now also disabled
if `!isAssistantAvailable`.

> [!NOTE]
> No logic around determining if the assistant should be shown has
changed, so all existing tests around `assistantAvailability` are still
in place and relevant. This was a surgical fix, and we short-circuit to
show this UI if `!isAssistantAvailable`.

This is a functional change to ESS only, as Serverless completely hides
the assistant when unavailable (`essentials` productTier) as originally
implemented in elastic#164763.

Before / After:
<p align="center">
<img width="300"
src="https://github.com/elastic/kibana/assets/2946766/92b512b6-9cec-4f83-948a-d1e101bdc9ec"
/> <img width="295"
src="https://github.com/elastic/kibana/assets/2946766/c3e39812-27e6-4c4f-ba4c-efb70adff6b5"
/>
</p>

(cherry picked from commit dff2d29)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.14

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

@spong spong deleted the license-fix branch May 16, 2024 04:23
kibanamachine added a commit that referenced this pull request May 16, 2024
#183576) (#183583)

# Backport

This will backport the following commits from `main` to `8.14`:
- [[Security Assistant] Show license upgrade CTA within new flyout
(#183576)](#183576)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Garrett
Spong","email":"spong@users.noreply.github.com"},"sourceCommit":{"committedDate":"2024-05-16T04:14:19Z","message":"[Security
Assistant] Show license upgrade CTA within new flyout (#183576)\n\n##
Summary\r\n\r\nThis is a fix for showing the license upgrade CTA when
using the new\r\nflyout experience with the Security
Assistant.\r\n\r\nTo test, downgrade your license from `trial` to
`basic` in Stack\r\nManagement and view that the CTA is now
back.\r\n\r\nThe `New Chat` and `Expand Conversations` button are now
also disabled\r\nif `!isAssistantAvailable`.\r\n\r\n> [!NOTE]\r\n> No
logic around determining if the assistant should be shown
has\r\nchanged, so all existing tests around `assistantAvailability` are
still\r\nin place and relevant. This was a surgical fix, and we
short-circuit to\r\nshow this UI if `!isAssistantAvailable`.\r\n\r\nThis
is a functional change to ESS only, as Serverless completely
hides\r\nthe assistant when unavailable (`essentials` productTier) as
originally\r\nimplemented in
#164763 /
After:\r\n<p align=\"center\">\r\n<img
width=\"300\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/92b512b6-9cec-4f83-948a-d1e101bdc9ec\"\r\n/>
<img
width=\"295\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/c3e39812-27e6-4c4f-ba4c-efb70adff6b5\"\r\n/>\r\n</p>","sha":"dff2d294d7083f23cc53b375fba542a89ee38558","branchLabelMapping":{"^v8.15.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","Team:
SecuritySolution","Feature:Security
Assistant","v8.14.0","v8.15.0"],"title":"[Security Assistant] Show
license upgrade CTA within new
flyout","number":183576,"url":"#183576
Assistant] Show license upgrade CTA within new flyout (#183576)\n\n##
Summary\r\n\r\nThis is a fix for showing the license upgrade CTA when
using the new\r\nflyout experience with the Security
Assistant.\r\n\r\nTo test, downgrade your license from `trial` to
`basic` in Stack\r\nManagement and view that the CTA is now
back.\r\n\r\nThe `New Chat` and `Expand Conversations` button are now
also disabled\r\nif `!isAssistantAvailable`.\r\n\r\n> [!NOTE]\r\n> No
logic around determining if the assistant should be shown
has\r\nchanged, so all existing tests around `assistantAvailability` are
still\r\nin place and relevant. This was a surgical fix, and we
short-circuit to\r\nshow this UI if `!isAssistantAvailable`.\r\n\r\nThis
is a functional change to ESS only, as Serverless completely
hides\r\nthe assistant when unavailable (`essentials` productTier) as
originally\r\nimplemented in
#164763 /
After:\r\n<p align=\"center\">\r\n<img
width=\"300\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/92b512b6-9cec-4f83-948a-d1e101bdc9ec\"\r\n/>
<img
width=\"295\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/c3e39812-27e6-4c4f-ba4c-efb70adff6b5\"\r\n/>\r\n</p>","sha":"dff2d294d7083f23cc53b375fba542a89ee38558"}},"sourceBranch":"main","suggestedTargetBranches":["8.14"],"targetPullRequestStates":[{"branch":"8.14","label":"v8.14.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.15.0","branchLabelMappingKey":"^v8.15.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/183576","number":183576,"mergeCommit":{"message":"[Security
Assistant] Show license upgrade CTA within new flyout (#183576)\n\n##
Summary\r\n\r\nThis is a fix for showing the license upgrade CTA when
using the new\r\nflyout experience with the Security
Assistant.\r\n\r\nTo test, downgrade your license from `trial` to
`basic` in Stack\r\nManagement and view that the CTA is now
back.\r\n\r\nThe `New Chat` and `Expand Conversations` button are now
also disabled\r\nif `!isAssistantAvailable`.\r\n\r\n> [!NOTE]\r\n> No
logic around determining if the assistant should be shown
has\r\nchanged, so all existing tests around `assistantAvailability` are
still\r\nin place and relevant. This was a surgical fix, and we
short-circuit to\r\nshow this UI if `!isAssistantAvailable`.\r\n\r\nThis
is a functional change to ESS only, as Serverless completely
hides\r\nthe assistant when unavailable (`essentials` productTier) as
originally\r\nimplemented in
#164763 /
After:\r\n<p align=\"center\">\r\n<img
width=\"300\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/92b512b6-9cec-4f83-948a-d1e101bdc9ec\"\r\n/>
<img
width=\"295\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/c3e39812-27e6-4c4f-ba4c-efb70adff6b5\"\r\n/>\r\n</p>","sha":"dff2d294d7083f23cc53b375fba542a89ee38558"}}]}]
BACKPORT-->

Co-authored-by: Garrett Spong <spong@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Fixes for quality problems that affect the customer experience Feature:Security Assistant Security Assistant release_note:skip Skip the PR/issue when compiling release notes Team: SecuritySolution Security Solutions Team working on SIEM, Endpoint, Timeline, Resolver, etc. v8.14.0 v8.15.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants