[SecuritySolution][Detections] Adds UI for new Rule Fields: Related Integrations, Required Fields, and Setup #131475
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| import { EuiLink } from '@elastic/eui'; | ||
| import { capitalize } from 'lodash'; | ||
| import React from 'react'; | ||
| import { RelatedIntegration } from '../../../../common/detection_engine/schemas/common'; | ||
|
|
||
| export const getIntegrationLink = (integration: RelatedIntegration, basePath: string) => { | ||
| const integrationURL = `${basePath}/app/integrations/detail/${integration.package}-${ | ||
| integration.version | ||
| }/overview${integration.integration ? `?integration=${integration.integration}` : ''}`; | ||
| return ( | ||
| <EuiLink href={integrationURL} target="_blank"> | ||
| {`${capitalize(integration.package)} ${capitalize(integration.integration)}`} | ||
| </EuiLink> | ||
| ); | ||
| }; |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| import React, { useState } from 'react'; | ||
| import { | ||
| EuiPopover, | ||
| EuiBadgeGroup, | ||
| EuiBadge, | ||
| EuiPopoverTitle, | ||
| EuiFlexGroup, | ||
| EuiText, | ||
| } from '@elastic/eui'; | ||
| import styled from 'styled-components'; | ||
| import { useBasePath } from '../../lib/kibana'; | ||
| import { getIntegrationLink } from './helpers'; | ||
| import { useInstalledIntegrations } from '../../../detections/containers/detection_engine/rules/use_installed_integrations'; | ||
| import type { | ||
| RelatedIntegration, | ||
| RelatedIntegrationArray, | ||
| } from '../../../../common/detection_engine/schemas/common'; | ||
|
|
||
| import * as i18n from '../../../detections/pages/detection_engine/rules/translations'; | ||
|
|
||
| export interface IntegrationsPopoverProps { | ||
| integrations: RelatedIntegrationArray; | ||
| } | ||
|
|
||
| const IntegrationsPopoverWrapper = styled(EuiFlexGroup)` | ||
| width: 100%; | ||
| `; | ||
|
|
||
| const PopoverWrapper = styled(EuiBadgeGroup)` | ||
| max-height: 400px; | ||
| max-width: 368px; | ||
| overflow: auto; | ||
| line-height: ${({ theme }) => theme.eui.euiLineHeight}; | ||
| `; | ||
|
|
||
| const IntegrationListItem = styled('li')` | ||
| list-style-type: disc; | ||
| margin-left: 25px; | ||
| `; | ||
| /** | ||
| * Component to render installed and available integrations | ||
| * @param integrations - array of integrations to display | ||
| */ | ||
| const IntegrationsPopoverComponent = ({ integrations }: IntegrationsPopoverProps) => { | ||
| const [isPopoverOpen, setPopoverOpen] = useState(false); | ||
| const { data } = useInstalledIntegrations({ packages: [] }); | ||
| // const data = undefined; // To test with installed_integrations endpoint not implemented | ||
| const basePath = useBasePath(); | ||
|
|
||
| const allInstalledIntegrations: RelatedIntegrationArray = data ?? []; | ||
| const availableIntegrations: RelatedIntegrationArray = []; | ||
| const installedIntegrations: RelatedIntegrationArray = []; | ||
|
|
||
| integrations.forEach((i: RelatedIntegration) => { | ||
| const match = allInstalledIntegrations.find( | ||
| (installed) => installed.package === i.package && installed?.integration === i?.integration | ||
| ); | ||
| if (match != null) { | ||
| // TODO: Do version check | ||
| installedIntegrations.push(match); | ||
| } else { | ||
| availableIntegrations.push(i); | ||
| } | ||
| }); | ||
|
|
||
| const badgeTitle = | ||
| data != null | ||
| ? `${installedIntegrations.length}/${integrations.length} ${i18n.INTEGRATIONS_BADGE}` | ||
| : `${integrations.length} ${i18n.INTEGRATIONS_BADGE}`; | ||
|
|
||
| return ( | ||
| <IntegrationsPopoverWrapper | ||
| alignItems="center" | ||
| gutterSize="s" | ||
| data-test-subj={'IntegrationsWrapper'} | ||
| > | ||
| <EuiPopover | ||
| ownFocus | ||
| data-test-subj={'IntegrationsDisplayPopover'} | ||
| button={ | ||
| <EuiBadge | ||
| iconType={'tag'} | ||
| color="hollow" | ||
| data-test-subj={'IntegrationsDisplayPopoverButton'} | ||
| onClick={() => setPopoverOpen(!isPopoverOpen)} | ||
| onClickAriaLabel={badgeTitle} | ||
| > | ||
| {badgeTitle} | ||
| </EuiBadge> | ||
| } | ||
| isOpen={isPopoverOpen} | ||
| closePopover={() => setPopoverOpen(!isPopoverOpen)} | ||
| repositionOnScroll | ||
| > | ||
| <EuiPopoverTitle data-test-subj={'IntegrationsDisplayPopoverTitle'}> | ||
| {i18n.INTEGRATIONS_POPOVER_TITLE(integrations.length)} | ||
| </EuiPopoverTitle> | ||
|
|
||
| <PopoverWrapper data-test-subj={'IntegrationsDisplayPopoverWrapper'}> | ||
| {data != null && ( | ||
| <> | ||
| <EuiText size={'s'}> | ||
| {i18n.INTEGRATIONS_POPOVER_DESCRIPTION_INSTALLED(installedIntegrations.length)} | ||
| </EuiText> | ||
| <ul> | ||
| {installedIntegrations.map((integration, index) => ( | ||
| <IntegrationListItem key={index}> | ||
| {getIntegrationLink(integration, basePath)} | ||
| </IntegrationListItem> | ||
| ))} | ||
| </ul> | ||
| </> | ||
| )} | ||
| {availableIntegrations.length > 0 && ( | ||
| <> | ||
| <EuiText size={'s'}> | ||
| {i18n.INTEGRATIONS_POPOVER_DESCRIPTION_UNINSTALLED(availableIntegrations.length)} | ||
| </EuiText> | ||
| <ul> | ||
| {availableIntegrations.map((integration, index) => ( | ||
| <IntegrationListItem key={index}> | ||
| {getIntegrationLink(integration, basePath)} | ||
| </IntegrationListItem> | ||
| ))} | ||
| </ul> | ||
| </> | ||
| )} | ||
| </PopoverWrapper> | ||
| </EuiPopover> | ||
| </IntegrationsPopoverWrapper> | ||
| ); | ||
| }; | ||
|
|
||
| const MemoizedIntegrationsPopover = React.memo(IntegrationsPopoverComponent); | ||
| MemoizedIntegrationsPopover.displayName = 'IntegrationsPopover'; | ||
|
|
||
| export const IntegrationsPopover = | ||
| MemoizedIntegrationsPopover as typeof IntegrationsPopoverComponent; |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,15 +13,14 @@ import { | |
| EuiBasicTable, | ||
| EuiButton, | ||
| EuiEmptyPrompt, | ||
| EuiIcon, | ||
| EuiLink, | ||
| EuiText, | ||
| } from '@elastic/eui'; | ||
|
|
||
| import styled from 'styled-components'; | ||
| import { useMlHref, ML_PAGES } from '@kbn/ml-plugin/public'; | ||
| import { PopoverItems } from '../../popover_items'; | ||
| import { useBasePath, useKibana } from '../../../lib/kibana'; | ||
| import * as i18n from './translations'; | ||
| import { JobSwitch } from './job_switch'; | ||
|
|
@@ -82,16 +81,24 @@ const getJobsTableColumns = ( | |
| }, | ||
| { | ||
| name: i18n.COLUMN_GROUPS, | ||
| render: ({ groups }: SecurityJob) => { | ||
| const renderItem = (group: string, i: number) => ( | ||
| <EuiBadge color="hollow" key={`${group}-${i}`} data-test-subj="group"> | ||
| {group} | ||
| </EuiBadge> | ||
| ); | ||
|
|
||
| return ( | ||
| <PopoverItems | ||
| items={groups} | ||
| numberOfItemsToDisplay={0} | ||
| popoverButtonTitle={`${groups.length} Groups`} | ||
| renderItem={renderItem} | ||
| dataTestPrefix="groups" | ||
| /> | ||
|
Comment on lines
+92
to
+98
Member
Author
There was a problem hiding this comment. Don't mind this... 😅 I was testing #131166 the other day and had it with the badge overflow. Since in doing this PR I learned of the
|
||
| ); | ||
| }, | ||
| width: '80px', | ||
| }, | ||
|
|
||
| { | ||
|
|
||
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@banderror -- this is as far as I went with plumbing for the
installed_integrationsAPI. Created this route, and also wired it up to to theuseInstalledIntegrationshook, so should just start working if you return aRelatedIntegrationArrayfrom this route 🙂