-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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 solution] [Endpoint] Revisit blocklist wrong labels #128773
Merged
kevinlog
merged 8 commits into
elastic:main
from
dasansol92:fix/olm-revisit_blocklist_list_labels-3237
Apr 12, 2022
Merged
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
590b6fe
Fixes wrong text for downgrade license docs link on blocklist.
dasansol92 26230cb
Fixes license downgraded banner for blocklist including the docs link
dasansol92 035df8f
Updates i18n keys for blocklist to be singular
dasansol92 17d07ec
Removes unused param name
dasansol92 35b0b81
Merge branch 'main' into fix/olm-revisit_blocklist_list_labels-3237
dasansol92 581bcd7
Merge branch 'main' into fix/olm-revisit_blocklist_list_labels-3237
dasansol92 00984d4
Merge branch 'main' into fix/olm-revisit_blocklist_list_labels-3237
ashokaditya 7f6fab5
Merge branch 'main' of https://github.com/elastic/kibana into fix/olm…
kevinlog File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 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 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 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 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 | ||||
---|---|---|---|---|---|---|
|
@@ -7,6 +7,9 @@ | |||||
|
||||||
import React, { memo } from 'react'; | ||||||
import { i18n } from '@kbn/i18n'; | ||||||
import { FormattedMessage } from '@kbn/i18n-react'; | ||||||
import { DocLinks } from '@kbn/doc-links'; | ||||||
import { EuiLink } from '@elastic/eui'; | ||||||
|
||||||
import { useHttp } from '../../../../common/lib/kibana'; | ||||||
import { ArtifactListPage, ArtifactListPageProps } from '../../../components/artifact_list_page'; | ||||||
|
@@ -48,52 +51,47 @@ const BLOCKLIST_PAGE_LABELS: ArtifactListPageProps['labels'] = { | |||||
), | ||||||
flyoutCreateSubmitSuccess: ({ name }) => | ||||||
i18n.translate('xpack.securitySolution.blocklist.flyoutCreateSubmitSuccess', { | ||||||
defaultMessage: '"{name}" has been added to your blocklist.', // FIXME: match this to design (needs count of items) | ||||||
defaultMessage: '"{name}" has been added to your blocklist.', | ||||||
values: { name }, | ||||||
}), | ||||||
flyoutEditSubmitSuccess: ({ name }) => | ||||||
i18n.translate('xpack.securitySolution.blocklist.flyoutEditSubmitSuccess', { | ||||||
defaultMessage: '"{name}" has been updated.', | ||||||
values: { name }, | ||||||
}), | ||||||
flyoutDowngradedLicenseDocsInfo: () => { | ||||||
return 'tbd...'; | ||||||
// FIXME: define docs link for license downgrade message. sample code below | ||||||
|
||||||
// const { docLinks } = useKibana().services; | ||||||
// return ( | ||||||
// <FormattedMessage | ||||||
// id="some-id-1" | ||||||
// defaultMessage="For more information, see our {link}." | ||||||
// value={{ | ||||||
// link: ( | ||||||
// <EuiLink target="_blank" href={`${docLinks.links.securitySolution.eventFilters}`}> | ||||||
// {' '} | ||||||
// <FormattedMessage | ||||||
// id="dome-id-2" | ||||||
// defaultMessage="Event filters documentation" | ||||||
// />{' '} | ||||||
// </EuiLink> | ||||||
// ), | ||||||
// }} | ||||||
// /> | ||||||
// ); | ||||||
flyoutDowngradedLicenseDocsInfo: ( | ||||||
securitySolutionDocsLinks: DocLinks['securitySolution'] | ||||||
): React.ReactNode => { | ||||||
return ( | ||||||
<> | ||||||
<FormattedMessage | ||||||
id="xpack.securitySolution.blocklist.flyoutDowngradedLicenseDocsInfo" | ||||||
defaultMessage="For more information, see our " | ||||||
/> | ||||||
<EuiLink target="_blank" href={`${securitySolutionDocsLinks.blocklist}`}> | ||||||
<FormattedMessage | ||||||
id="xpack.securitySolution.blocklist.flyoutDowngradedLicenseDocsLink" | ||||||
defaultMessage="Blocklist documentation" | ||||||
/> | ||||||
</EuiLink> | ||||||
</> | ||||||
); | ||||||
}, | ||||||
deleteActionSuccess: (itemName) => | ||||||
i18n.translate('xpack.securitySolution.blocklist.deleteSuccess', { | ||||||
defaultMessage: '"{itemName}" has been removed from blocklist.', | ||||||
values: { itemName }, | ||||||
}), | ||||||
emptyStateTitle: i18n.translate('xpack.securitySolution.blocklist.emptyStateTitle', { | ||||||
defaultMessage: 'Add your first blocklist', | ||||||
defaultMessage: 'Add your first blocklist entry', | ||||||
}), | ||||||
emptyStateInfo: i18n.translate('xpack.securitySolution.blocklist.emptyStateInfo', { | ||||||
defaultMessage: | ||||||
'The blocklist prevents selected applications from running on your hosts by extending the list of processes the Endpoint considers malicious.', | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Possible tweaks for flow and consistency, from feature sync discussion with @kevinlog, @caitlinbetz, @jmikell821:
Suggested change
|
||||||
}), | ||||||
emptyStateInfo: i18n.translate( | ||||||
'xpack.securitySolution.blocklist.emptyStateInfo', | ||||||
{ defaultMessage: 'Add a blocklist to prevent execution on the endpoint' } // FIXME: need wording here form PM | ||||||
), | ||||||
emptyStatePrimaryButtonLabel: i18n.translate( | ||||||
'xpack.securitySolution.blocklist.emptyStatePrimaryButtonLabel', | ||||||
{ defaultMessage: 'Add blocklist' } | ||||||
{ defaultMessage: 'Add blocklist entry' } | ||||||
), | ||||||
searchPlaceholderInfo: i18n.translate('xpack.securitySolution.blocklist.searchPlaceholderInfo', { | ||||||
defaultMessage: 'Search on the fields below: name, description, value', | ||||||
|
This file contains 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 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.
In the screenshot above, there's a period missing at the end of this sentence, and "blocklist documentation" should probably be lowercase since the feature isn't a proper name.
"For more information, see our blocklist documentation."