Skip to content

[SIEM][Detection Engine] Fix StepDescription value in StepRuleActions#63677

Merged
patrykkopycinski merged 7 commits intoelastic:masterfrom
patrykkopycinski:fix/siem-rule-actions-form
May 12, 2020
Merged

[SIEM][Detection Engine] Fix StepDescription value in StepRuleActions#63677
patrykkopycinski merged 7 commits intoelastic:masterfrom
patrykkopycinski:fix/siem-rule-actions-form

Conversation

@patrykkopycinski
Copy link
Contributor

@patrykkopycinski patrykkopycinski commented Apr 16, 2020 •
edited
Loading

Summary

Fixes #63332 (comment)
Zrzut ekranu 2020-04-16 o 12 00 04

Checklist

@patrykkopycinski patrykkopycinski added bug Fixes for quality problems that affect the customer experience Team:SIEM v8.0.0 v7.8.0 v7.7.1 labels Apr 16, 2020
@patrykkopycinski patrykkopycinski requested review from rylnd and spong April 16, 2020 10:01
@patrykkopycinski patrykkopycinski requested a review from a team as a code owner April 16, 2020 10:01
@patrykkopycinski patrykkopycinski self-assigned this Apr 16, 2020
@elasticmachine
Copy link
Contributor

elasticmachine commented Apr 16, 2020

Pinging @elastic/siem (Team:SIEM)

@patrykkopycinski patrykkopycinski added the release_note:skip Skip the PR/issue when compiling release notes label Apr 16, 2020
rylnd
rylnd approved these changes Apr 16, 2020
View reviewed changes
Copy link
Contributor

@rylnd rylnd left a comment

Choose a reason for hiding this comment

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

Behavior here is much improved, LGTM.

...siem/public/pages/detection_engine/rules/components/description_step/actions_description.tsx
return (
<ul>
{actions.map((action, index) => (
<li key={index}>{getActionTypeName(action.actionTypeId)}</li>
Copy link
Contributor

@rylnd rylnd Apr 16, 2020

Choose a reason for hiding this comment

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

Maybe we should use the actionTypeId for the key, here? Is there a field unique to the action?

Copy link
Contributor Author

@patrykkopycinski patrykkopycinski Apr 16, 2020

Choose a reason for hiding this comment

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

you can have multiple actions of the same type, so in that case, actionTypeId will not be unique

@rylnd
Copy link
Contributor

rylnd commented Apr 16, 2020

There is one outstanding bug on this branch related to the connector being lost when editing another step:
Apr-16-2020 13-30-56

I'm not sure if this is expected or fixed elsewhere; @patrykkopycinski let me know and I can open a separate issue if necessary.

@patrykkopycinski
Copy link
Contributor Author

patrykkopycinski commented Apr 16, 2020

@rylnd if you are ok with that I'd link this issue in #63332 as there were some logic changes in terms of the form state

@rylnd
Copy link
Contributor

rylnd commented Apr 17, 2020

@rylnd if you are ok with that I'd link this issue in #63332 as there were some logic changes in terms of the form state

Works for me!

@spong
Copy link
Member

spong commented Apr 20, 2020

@elasticmachine merge upstream

elasticmachine and others added 2 commits April 20, 2020 17:39
@elasticmachine
Merge branch 'master' into fix/siem-rule-actions-form
8f4c3a6
@patrykkopycinski
Merge branch 'master' of github.com:elastic/kibana into fix/siem-rule…
18d4c5a 
…-actions-form

# Conflicts:
#	x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
#	x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/throttle_select_field/index.tsx
@patrykkopycinski patrykkopycinski requested a review from a team as a code owner May 11, 2020 16:20
@patrykkopycinski
merge conflicts
3ce363b
@patrykkopycinski
fix imports
0341740
@patrykkopycinski
fix import
bec3b18
@patrykkopycinski
Merge branch 'master' of github.com:elastic/kibana into fix/siem-rule…
b699ae2 
…-actions-form

# Conflicts:
#	x-pack/plugins/siem/public/alerts/components/rules/description_step/actions_description.tsx
#	x-pack/plugins/siem/public/alerts/components/rules/description_step/throttle_description.tsx
#	x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
#	x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/index.tsx
#	x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/schema.tsx
#	x-pack/plugins/siem/public/pages/detection_engine/rules/components/throttle_select_field/index.tsx
@kibanamachine
Copy link
Contributor

kibanamachine commented May 12, 2020

💚 Build Succeeded

History

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

@patrykkopycinski patrykkopycinski merged commit 533b481 into elastic:master May 12, 2020
@patrykkopycinski patrykkopycinski deleted the fix/siem-rule-actions-form branch May 12, 2020 12:42
@patrykkopycinski patrykkopycinski mentioned this pull request May 12, 2020
Merged
patrykkopycinski added a commit to patrykkopycinski/kibana that referenced this pull request May 12, 2020
@patrykkopycinski
[SIEM][Detection Engine] Fix StepDescription value in StepRuleActions (…
d7a0d0f 
…elastic#63677)

# Conflicts:
#	x-pack/plugins/siem/public/alerts/components/rules/description_step/index.tsx
#	x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/index.tsx
#	x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/schema.tsx
#	x-pack/plugins/siem/public/alerts/components/rules/throttle_select_field/index.tsx
#	x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/actions_description.tsx
#	x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/throttle_description.tsx
patrykkopycinski added a commit to patrykkopycinski/kibana that referenced this pull request May 12, 2020
@patrykkopycinski
[SIEM][Detection Engine] Fix StepDescription value in StepRuleActions (…
9112634 
…elastic#63677)

# Conflicts:
#	x-pack/plugins/siem/public/alerts/components/rules/description_step/index.tsx
#	x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/index.tsx
#	x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/schema.tsx
#	x-pack/plugins/siem/public/alerts/components/rules/throttle_select_field/index.tsx
#	x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/actions_description.tsx
#	x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/throttle_description.tsx
patrykkopycinski added a commit to patrykkopycinski/kibana that referenced this pull request May 12, 2020
@patrykkopycinski
[SIEM][Detection Engine] Fix StepDescription value in StepRuleActions (…
9112634 
…elastic#63677)

# Conflicts:
#	x-pack/plugins/siem/public/alerts/components/rules/description_step/index.tsx
#	x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/index.tsx
#	x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/schema.tsx
#	x-pack/plugins/siem/public/alerts/components/rules/throttle_select_field/index.tsx
#	x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/actions_description.tsx
#	x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/throttle_description.tsx
This was referenced May 12, 2020
Merged
Merged
patrykkopycinski added a commit to patrykkopycinski/kibana that referenced this pull request May 12, 2020
@patrykkopycinski
[SIEM][Detection Engine] Fix StepDescription value in StepRuleActions (…
be94592 
…elastic#63677)

# Conflicts:
#	x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/actions_description.tsx
#	x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/throttle_description.tsx
#	x-pack/plugins/siem/public/alerts/components/rules/description_step/index.tsx
#	x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/index.tsx
#	x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/schema.tsx
#	x-pack/plugins/siem/public/alerts/components/rules/throttle_select_field/index.tsx
patrykkopycinski added a commit that referenced this pull request May 12, 2020
@patrykkopycinski
[7.x] [SIEM][Detection Engine] Fix StepDescription value in StepRuleA…
daea374 
…ctions (#63677) (#66213)
patrykkopycinski added a commit that referenced this pull request May 12, 2020
@patrykkopycinski
[7.8] [SIEM][Detection Engine] Fix StepDescription value in StepRuleA…
7b3fff1 
…ctions (#63677) (#66215)
patrykkopycinski added a commit that referenced this pull request May 12, 2020
@patrykkopycinski
[7.7] [SIEM][Detection Engine] Fix StepDescription value in StepRuleA…
bc62cbd 
…ctions (#63677) (#66218)
@MindyRS MindyRS added the Team: SecuritySolution Security Solutions Team working on SIEM, Endpoint, Timeline, Resolver, etc. label Sep 23, 2021
@elasticmachine
Copy link
Contributor

elasticmachine commented Sep 23, 2021

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rylnd rylnd rylnd approved these changes

@spong spong Awaiting requested review from spong

Assignees

@patrykkopycinski patrykkopycinski

Labels

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. Team:SIEM v7.7.1 v7.8.0 v8.0.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@patrykkopycinski @elasticmachine @rylnd @spong @kibanamachine @MindyRS