From d679043443549c1141d7f3315c1d3c1f7c25e0e8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 9 May 2024 23:23:30 +0000 Subject: [PATCH] added addition check for filtering rendered rules (#1022) Signed-off-by: Amardeepsingh Siglani (cherry picked from commit 74f8c848e5b46afecdb6e195f9da96d81822b26d) Signed-off-by: github-actions[bot] --- .../components/FindingDetailsFlyout.tsx | 149 ++++++++++-------- 1 file changed, 79 insertions(+), 70 deletions(-) diff --git a/public/pages/Findings/components/FindingDetailsFlyout.tsx b/public/pages/Findings/components/FindingDetailsFlyout.tsx index 8637b002..fade150f 100644 --- a/public/pages/Findings/components/FindingDetailsFlyout.tsx +++ b/public/pages/Findings/components/FindingDetailsFlyout.tsx @@ -233,79 +233,88 @@ export default class FindingDetailsFlyout extends Component< this.setState({ ...this.state, ruleViewerFlyoutData: null }); }; + shouldRenderRule = ({ id }: Query) => { + const { allRules = {} } = this.state; + const isSigmaRule = !!allRules[id]; + + if (!isSigmaRule) { + return false; + } + + return !isThreatIntelQuery(id); + }; + renderRuleDetails = (rules: Query[] = []) => { const { allRules = {} } = this.state; - return rules - .filter(({ id }) => !isThreatIntelQuery(id)) - .map((rule, key) => { - const fullRule = allRules[rule.id]; - const severity = capitalizeFirstLetter(fullRule.level); - return ( -
- - {fullRule.title} - - Severity: {severity} - -
- } - initialIsOpen={rules.length === 1} - data-test-subj={`finding-details-flyout-rule-accordion-${key}`} - > - - - - - this.showRuleDetails(fullRule, rule.id)} - data-test-subj={`finding-details-flyout-${fullRule.title}-details`} - > - {fullRule.title || DEFAULT_EMPTY_DATA} - - - - - - - {severity || DEFAULT_EMPTY_DATA} - - - - - { + const fullRule = allRules[rule.id]; + const severity = capitalizeFirstLetter(fullRule.level); + return ( +
+ + {fullRule.title} + + Severity: {severity} + +
+ } + initialIsOpen={rules.length === 1} + data-test-subj={`finding-details-flyout-rule-accordion-${key}`} + > + + + + + this.showRuleDetails(fullRule, rule.id)} + data-test-subj={`finding-details-flyout-${fullRule.title}-details`} > - {getLogTypeLabel(fullRule.category) || DEFAULT_EMPTY_DATA} - - - - - - {fullRule.description || DEFAULT_EMPTY_DATA} - - - - - - {this.renderTags(rule.tags) || DEFAULT_EMPTY_DATA} - - - - {rules.length > 1 && } - - ); - }); + {fullRule.title || DEFAULT_EMPTY_DATA} + +
+
+ + + + {severity || DEFAULT_EMPTY_DATA} + + + + + + {getLogTypeLabel(fullRule.category) || DEFAULT_EMPTY_DATA} + + +
+ + + {fullRule.description || DEFAULT_EMPTY_DATA} + + + + + + {this.renderTags(rule.tags) || DEFAULT_EMPTY_DATA} + +
+ + {rules.length > 1 && } + + ); + }); }; getIndexPatternId = async () => {